Skip to content

Commit

Permalink
[server] Fixed Casting Error (apache#11697)
Browse files Browse the repository at this point in the history
* fixed casting error

* added unit test for backlogQuota configuration

* code review changes

* code review changes

* removed http from zookeeperServers config
  • Loading branch information
abhilashmandaliya authored Aug 18, 2021
1 parent ca7c70e commit ffaba80
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public BacklogQuotaManager(PulsarService pulsar) {
this.isTopicLevelPoliciesEnable = pulsar.getConfiguration().isTopicLevelPoliciesEnabled();
double backlogQuotaGB = pulsar.getConfiguration().getBacklogQuotaDefaultLimitGB();
this.defaultQuota = BacklogQuotaImpl.builder()
.limitSize(backlogQuotaGB > 0 ? (long) backlogQuotaGB * BacklogQuotaImpl.BYTES_IN_GIGABYTE
.limitSize(backlogQuotaGB > 0 ? (long) (backlogQuotaGB * BacklogQuotaImpl.BYTES_IN_GIGABYTE)
: pulsar.getConfiguration().getBacklogQuotaDefaultLimitBytes())
.limitTime(pulsar.getConfiguration().getBacklogQuotaDefaultLimitSecond())
.retentionPolicy(pulsar.getConfiguration().getBacklogQuotaDefaultRetentionPolicy())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static Map<BacklogQuota.BacklogQuotaType, BacklogQuota> backlogQuotaMap(S

public static BacklogQuota sizeBacklogQuota(ServiceConfiguration configuration) {
long backlogQuotaBytes = configuration.getBacklogQuotaDefaultLimitGB() > 0
? ((long) configuration.getBacklogQuotaDefaultLimitGB() * BacklogQuotaImpl.BYTES_IN_GIGABYTE)
? ((long) (configuration.getBacklogQuotaDefaultLimitGB() * BacklogQuotaImpl.BYTES_IN_GIGABYTE))
: configuration.getBacklogQuotaDefaultLimitBytes();
return BacklogQuota.builder()
.limitSize(backlogQuotaBytes)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.pulsar.broker.service;

import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.cache.ConfigurationCacheService;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;

@Test(groups = "broker")
public class BacklogQuotaManagerConfigurationTest {

private ServiceConfiguration serviceConfiguration;
private PulsarService pulsarService;

@BeforeMethod
public void setup() {
serviceConfiguration = new ServiceConfiguration();
initializeServiceConfiguration();
pulsarService = getPulsarService();
}

@Test
public void testBacklogQuotaDefaultLimitGBConversion() {
serviceConfiguration.setBacklogQuotaDefaultLimitGB(1.6);

BacklogQuotaManager backlogQuotaManager = new BacklogQuotaManager(pulsarService);

assertEquals(backlogQuotaManager.getDefaultQuota().getLimitSize(), 1717986918);
}

@Test
public void testBacklogQuotaDefaultLimitPrecedence() {
serviceConfiguration.setBacklogQuotaDefaultLimitGB(1.6);
serviceConfiguration.setBacklogQuotaDefaultLimitBytes(123);

BacklogQuotaManager backlogQuotaManager = new BacklogQuotaManager(pulsarService);

assertEquals(backlogQuotaManager.getDefaultQuota().getLimitSize(), 1717986918);
}

@Test
public void testBacklogQuotaDefaultLimitBytes() {
serviceConfiguration.setBacklogQuotaDefaultLimitGB(0);
serviceConfiguration.setBacklogQuotaDefaultLimitBytes(123);

BacklogQuotaManager backlogQuotaManager = new BacklogQuotaManager(pulsarService);

assertEquals(backlogQuotaManager.getDefaultQuota().getLimitSize(), 123);
}

private void initializeServiceConfiguration() {
serviceConfiguration.setClusterName("test");
serviceConfiguration.setZookeeperServers("localhost:2181");
}

private PulsarService getPulsarService() {
PulsarService pulsarService = mock(PulsarService.class);
ConfigurationCacheService configurationCacheService = mock(ConfigurationCacheService.class);
when(pulsarService.getConfiguration()).thenReturn(serviceConfiguration);
when(pulsarService.getConfigurationCache()).thenReturn(configurationCacheService);
return pulsarService;
}
}

0 comments on commit ffaba80

Please sign in to comment.