[pulsar] branch master updated: Support set password to managed ledger from brokerconfg (#6844)

[zhaijia]

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

zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 2122e27  Support set password to managed ledger from brokerconfg 
(#6844)
2122e27 is described below

commit 2122e271ba5cddeecb2fee411213bbb1c9b672f6
Author: liudezhi <33149602+liudezhi2...@users.noreply.github.com>
AuthorDate: Thu Apr 30 10:59:44 2020 +0800

    Support set password to managed ledger from brokerconfg (#6844)
    
    Master Issue: #6843
    ## Motivation
    
    broker supports ManagedLedger configuration
    
    ## Modifications
    
    This change can be supported managedLedgerPassword configuration
    
    org.apache.pulsar.broker.ServiceConfiguration
    ```java
        @FieldContext(
                category = CATEGORY_STORAGE_ML,
                doc = "Default  password to use when writing to BookKeeper. 
\n\nDefault is ``."
            )
        private String managedLedgerPassword = "";
    ```
    org.apache.pulsar.broker.service.BrokerService
    ```java
      managedLedgerConfig.setPassword(serviceConfig.getManagedLedgerPassword());
    ```
    
    * support setPassword to managedLedger from brokerconfg
    
    * support setPassword to managedLedger from brokerconfg
    
    Co-authored-by: dezhiliu <dezhi...@tencent.com>
---
 .../main/java/org/apache/pulsar/broker/ServiceConfiguration.java    | 6 ++++++
 .../main/java/org/apache/pulsar/broker/service/BrokerService.java   | 1 +
 2 files changed, 7 insertions(+)

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 2b0b0e8..a50611a 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
@@ -986,6 +986,12 @@ public class ServiceConfiguration implements 
PulsarConfiguration {
     private DigestType managedLedgerDigestType = DigestType.CRC32C;
 
     @FieldContext(
+            category = CATEGORY_STORAGE_ML,
+            doc = "Default  password to use when writing to BookKeeper. 
\n\nDefault is ``."
+        )
+    private String managedLedgerPassword = "";
+
+    @FieldContext(
         minValue = 1,
         category = CATEGORY_STORAGE_ML,
         doc = "Max number of bookies to use when creating a ledger"
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 ed10e1d..4c935d1 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
@@ -1017,6 +1017,7 @@ public class BrokerService implements Closeable, 
ZooKeeperCacheListener<Policies
             }
             
managedLedgerConfig.setThrottleMarkDelete(persistencePolicies.getManagedLedgerMaxMarkDeleteRate());
             
managedLedgerConfig.setDigestType(serviceConfig.getManagedLedgerDigestType());
+            
managedLedgerConfig.setPassword(serviceConfig.getManagedLedgerPassword());
 
             
managedLedgerConfig.setMaxUnackedRangesToPersist(serviceConfig.getManagedLedgerMaxUnackedRangesToPersist());
             
managedLedgerConfig.setMaxUnackedRangesToPersistInZk(serviceConfig.getManagedLedgerMaxUnackedRangesToPersistInZooKeeper());