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

[pulsar] branch branch-2.9 updated: [fix][broker] Fix setManagedLedgerOffloadedReadPriority not work. (#16436)

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

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


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new 98fc43cc2f7 [fix][broker] Fix setManagedLedgerOffloadedReadPriority not work. (#16436)
98fc43cc2f7 is described below

commit 98fc43cc2f7c22d1b49678f3de22f8c483d62e97
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 078ad61249f..80baa7c2f8e 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
@@ -33,6 +33,7 @@ import java.util.Properties;
 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")
@@ -61,6 +62,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 e1da6a1c737..3d920902d80 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
@@ -254,6 +254,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() {