You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by wa...@apache.org on 2022/03/15 16:04:58 UTC

[pulsar] 02/13: Merge branch 'master' of https://github.com/apache/pulsar

This is an automated email from the ASF dual-hosted git repository.

wave pushed a commit to branch dave2wave-branch-14693
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 9aa943b291a6403e02740790b678af7a9654eb07
Merge: 72f0fab 80f47d1
Author: Dave Fisher <da...@datastax.com>
AuthorDate: Fri Jan 28 11:43:41 2022 -0800

    Merge branch 'master' of https://github.com/apache/pulsar

 conf/broker.conf                                   |   4 +-
 deployment/terraform-ansible/templates/broker.conf |   4 +-
 pom.xml                                            |   2 +-
 .../apache/pulsar/broker/ServiceConfiguration.java |   7 +-
 .../org/apache/pulsar/broker/PulsarService.java    |   9 +-
 .../broker/TransactionMetadataStoreService.java    |  21 +-
 .../apache/pulsar/broker/admin/AdminResource.java  |  44 ++-
 .../pulsar/broker/admin/impl/BrokersBase.java      |  55 ++--
 .../broker/admin/impl/PersistentTopicsBase.java    | 217 ++++++++------
 .../pulsar/broker/admin/v2/PersistentTopics.java   | 111 +++++++
 .../pulsar/broker/loadbalance/LoadManager.java     |   3 +
 .../broker/loadbalance/ModularLoadManager.java     |   6 +
 .../pulsar/broker/loadbalance/NoopLoadManager.java |   6 +
 .../loadbalance/impl/ModularLoadManagerImpl.java   |  17 ++
 .../impl/ModularLoadManagerWrapper.java            |   6 +
 .../loadbalance/impl/SimpleLoadManagerImpl.java    |  18 ++
 .../pulsar/broker/service/AbstractTopic.java       |  56 ++--
 ...ConsistentHashingStickyKeyConsumerSelector.java |   2 +-
 .../apache/pulsar/broker/service/ServerCnx.java    |  26 +-
 .../service/nonpersistent/NonPersistentTopic.java  |   2 -
 .../service/persistent/MessageDeduplication.java   |   7 +-
 .../broker/service/persistent/PersistentTopic.java |   2 -
 .../buffer/impl/TransactionBufferHandlerImpl.java  |  55 +---
 .../recover/TransactionRecoverTrackerImpl.java     |   6 +-
 .../pulsar/broker/web/PulsarWebResource.java       | 189 ++++++------
 .../broker/BrokerMessageDeduplicationTest.java     |  73 +++++
 .../broker/admin/AdminApiSchemaAutoUpdateTest.java |  17 +-
 .../org/apache/pulsar/broker/admin/AdminTest.java  |  11 +-
 .../loadbalance/ModularLoadManagerImplTest.java    |   2 +
 .../loadbalance/impl/ThresholdShedderTest.java     | 221 ++++++++++++++
 .../TransactionMetadataStoreServiceTest.java       |  14 +-
 .../broker/stats/TransactionMetricsTest.java       |   6 +-
 .../pulsar/broker/transaction/TransactionTest.java |  41 +++
 .../client/api/KeySharedSubscriptionTest.java      |  73 +++++
 ...hemaTypeCompatibilityCheckOnTopicLevelTest.java | 329 +++++++++++++++++++++
 .../apache/pulsar/client/admin/TopicPolicies.java  |  46 +++
 .../client/admin/internal/TopicPoliciesImpl.java   |  57 ++++
 .../org/apache/pulsar/admin/cli/CmdTopics.java     |  49 +++
 .../policies/data/HierarchyTopicPolicies.java      |   3 +-
 .../common/policies/data/TopicOperation.java       |   3 +
 .../pulsar/common/policies/data/TopicPolicies.java |   1 +
 .../org/apache/pulsar/common/util/FutureUtil.java  |  20 +-
 pulsar-io/debezium/mongodb/pom.xml                 |   7 +
 pulsar-io/mongo/pom.xml                            |   2 +-
 site2/docs/administration-load-balance.md          |  10 +-
 site2/docs/assets/OverloadShedder.png              | Bin 0 -> 44951 bytes
 site2/docs/assets/ThresholdShedder.png             | Bin 0 -> 56518 bytes
 site2/docs/assets/UniformLoadShedder.png           | Bin 0 -> 50894 bytes
 site2/docs/reference-configuration.md              |   1 +
 src/owasp-dependency-check-suppressions.xml        |  94 +++++-
 .../SchemaCompatibilityStrategyTest.java           |  85 ++++++
 .../topologies/PulsarClusterTestBase.java          |   5 +
 52 files changed, 1693 insertions(+), 352 deletions(-)