sijie closed pull request #837: Fix FlakyTest
TestRegionAwareEnsemblePlacementPolicy
URL: https://github.com/apache/bookkeeper/pull/837
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
index d29499eca..1dcf0e10c 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
@@ -29,9 +29,7 @@
import static
org.apache.bookkeeper.feature.SettableFeatureProvider.DISABLE_ALL;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
import io.netty.util.HashedWheelTimer;
-
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
@@ -40,9 +38,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-
import junit.framework.TestCase;
-
import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.feature.FeatureProvider;
@@ -75,6 +71,10 @@
static void updateMyRack(String rack) throws Exception {
StaticDNSResolver.addNodeToRack(InetAddress.getLocalHost().getHostAddress(),
rack);
StaticDNSResolver.addNodeToRack(InetAddress.getLocalHost().getHostName(), rack);
+ BookieSocketAddress bookieAddress = new BookieSocketAddress(
+ InetAddress.getLocalHost().getHostAddress(), 0);
+
StaticDNSResolver.addNodeToRack(bookieAddress.getSocketAddress().getHostName(),
rack);
+
StaticDNSResolver.addNodeToRack(bookieAddress.getSocketAddress().getAddress().getHostAddress(),
rack);
StaticDNSResolver.addNodeToRack("127.0.0.1", rack);
StaticDNSResolver.addNodeToRack("localhost", rack);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
