You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/07/10 06:52:57 UTC

[pulsar] 18/19: [fix][broker] Fix setManagedLedgerOffloadedReadPriority not work. (#16436)

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

penghui pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit d60928fbf295acb1ce222ac3ff8dc94334a32e13
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Fri Jul 8 10:04:21 2022 +0800

    [fix][broker] Fix setManagedLedgerOffloadedReadPriority not work. (#16436)
    
    (cherry picked from commit 52f7f1357c7a2c57f3f26321da0fc11d103bf6ca)
---
 .../org/apache/pulsar/common/naming/ServiceConfigurationTest.java    | 3 +++
 .../org/apache/pulsar/common/policies/data/OffloadPoliciesImpl.java  | 5 +++++
 2 files changed, 8 insertions(+)

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 c56e6e3b77f..de78f0af9ec 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
@@ -42,6 +42,7 @@ import lombok.Cleanup;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
 import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode;
+import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
 import org.testng.annotations.Test;
 
 @Test(groups = "broker-naming")
@@ -70,6 +71,8 @@ public class ServiceConfigurationTest {
         assertEquals(config.getMaxMessagePublishBufferSizeInMB(), -1);
         assertEquals(config.getManagedLedgerDataReadPriority(), "bookkeeper-first");
         assertEquals(config.getBacklogQuotaDefaultLimitGB(), 0.05);
+        OffloadPoliciesImpl offloadPolicies = OffloadPoliciesImpl.create(config.getProperties());
+        assertEquals(offloadPolicies.getManagedLedgerOffloadedReadPriority().getValue(), "bookkeeper-first");
     }
 
     @Test
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 7c2b74286fe..42f3ccc42e8 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
@@ -255,6 +255,11 @@ public class OffloadPoliciesImpl implements Serializable, OffloadPolicies {
             setManagedLedgerOffloadDeletionLagInMillis(
                     Long.parseLong(properties.getProperty(DELETION_LAG_NAME_IN_CONF_FILE)));
         }
+
+        if (properties.containsKey("managedLedgerDataReadPriority")) {
+            setManagedLedgerOffloadedReadPriority(
+                    OffloadedReadPriority.fromString(properties.getProperty("managedLedgerDataReadPriority")));
+        }
     }
 
     public boolean driverSupported() {