[pulsar] branch master updated: Fix failing test LoadReportNetworkLimit (#9581)

[mmerli]

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

mmerli 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 927a270  Fix failing test LoadReportNetworkLimit (#9581)
927a270 is described below

commit 927a270714f8d6f297ae2820401a1347e6e3ac9f
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Fri Feb 12 22:55:02 2021 +0200

    Fix failing test LoadReportNetworkLimit (#9581)
    
    - test fails on Linux when there are more than 1 nics
---
 .../broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java    |  4 ++++
 .../pulsar/broker/loadbalance/LoadReportNetworkLimit.java    | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java
index 46ba077..8e4e3c5 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LinuxBrokerHostUsageImpl.java
@@ -214,6 +214,10 @@ public class LinuxBrokerHostUsageImpl implements 
BrokerHostUsage {
         }
     }
 
+    public int getNicCount() {
+        return getNics().size();
+    }
+
     private boolean isPhysicalNic(Path path) {
         if (!path.toString().contains("/virtual/")) {
             try {
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimit.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimit.java
index ab3d0aa..f24966c 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimit.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadReportNetworkLimit.java
@@ -18,15 +18,17 @@
  */
 package org.apache.pulsar.broker.loadbalance;
 
+import static org.testng.Assert.assertEquals;
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.broker.loadbalance.impl.LinuxBrokerHostUsageImpl;
 import org.apache.pulsar.policies.data.loadbalancer.LoadManagerReport;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import static org.testng.Assert.*;
 
 public class LoadReportNetworkLimit extends MockedPulsarServiceBaseTest {
+    int nicCount;
 
     @BeforeClass
     @Override
@@ -34,6 +36,10 @@ public class LoadReportNetworkLimit extends 
MockedPulsarServiceBaseTest {
         conf.setLoadBalancerEnabled(true);
         conf.setLoadBalancerOverrideBrokerNicSpeedGbps(5.4);
         super.internalSetup();
+
+        if (SystemUtils.IS_OS_LINUX) {
+            nicCount = new LinuxBrokerHostUsageImpl(pulsar).getNicCount();
+        }
     }
 
     @AfterClass(alwaysRun = true)
@@ -49,8 +55,8 @@ public class LoadReportNetworkLimit extends 
MockedPulsarServiceBaseTest {
         LoadManagerReport report = admin.brokerStats().getLoadReport();
 
         if (SystemUtils.IS_OS_LINUX) {
-            assertEquals(report.getBandwidthIn().limit, 5.4 * 1024 * 1024);
-            assertEquals(report.getBandwidthOut().limit, 5.4 * 1024 * 1024);
+            assertEquals(report.getBandwidthIn().limit, nicCount * 5.4 * 1024 
* 1024);
+            assertEquals(report.getBandwidthOut().limit, nicCount * 5.4 * 1024 
* 1024);
         } else {
             // On non-Linux system we don't report the network usage
             assertEquals(report.getBandwidthIn().limit, -1.0);