[Branch-2.8]fix cherry-pick issue#12397

hangc0276 merged 5 commits intoapache:branch-2.8apache/pulsar:branch-2.8from

hangc0276:chenhang/fix_cherry-pick-20211017-issuehangc0276/pulsar:chenhang/fix_cherry-pick-20211017-issueCopy head branch name to clipboard