This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new afcaade Fail earlier when encountering DNS issues
afcaade is described below
commit afcaade7c4c866a595b52ce71ee58b19352b2dbb
Author: Aaron Gresch <[email protected]>
AuthorDate: Wed Oct 25 15:59:40 2017 +0200
Fail earlier when encountering DNS issues
We had some DNS issues today and various
TestRegionAwareEnsemblePlacementPolicy tests were failing for me.
The LOG warning in RackawareEnsemblePlacementPolicyIml was not printing the
right variable, which would have given a clue.
Additionally, the repp.myRegion was set to UNKNOWN, causing incorrect code
flow. Added an assert to kill the test as soon as this occurs.
Author: Aaron Gresch <[email protected]>
Reviewers: Ivan Kelly <[email protected]>, Enrico Olivelli
<[email protected]>, Sijie Guo <[email protected]>
This closes #658 from agresch/agresch_dns_failure
---
.../client/RackawareEnsemblePlacementPolicyImpl.java | 2 +-
.../client/TestRegionAwareEnsemblePlacementPolicy.java | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index a7a59db..527f180 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -131,7 +131,7 @@ class RackawareEnsemblePlacementPolicyImpl extends
TopologyAwareEnsemblePlacemen
for (int i = 0; i < rNames.size(); ++i) {
if (rNames.get(i) == null) {
LOG.warn("Failed to resolve network location for {},
using default rack for it : {}.",
- rNames.get(i), defaultRack);
+ names.get(i), defaultRack);
rNames.set(i, defaultRack);
}
}
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 5387824..da11e14 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
@@ -129,6 +129,9 @@ public class TestRegionAwareEnsemblePlacementPolicy extends
TestCase {
repp = new RegionAwareEnsemblePlacementPolicy();
repp.initialize(conf, Optional.<DNSToSwitchMapping>empty(), timer,
DISABLE_ALL, NullStatsLogger.INSTANCE);
+ // make sure we've detected the right region
+ assertEquals("r1", repp.myRegion);
+
Set<BookieSocketAddress> addrs = new HashSet<BookieSocketAddress>();
addrs.add(addr1);
addrs.add(addr2);
@@ -136,15 +139,15 @@ public class TestRegionAwareEnsemblePlacementPolicy
extends TestCase {
addrs.add(addr4);
repp.onClusterChanged(addrs, new HashSet<BookieSocketAddress>());
- List<Integer> reoderSet = repp.reorderReadSequence(ensemble, writeSet,
new HashMap<BookieSocketAddress, Long>());
+ List<Integer> reorderSet = repp.reorderReadSequence(ensemble,
writeSet, new HashMap<BookieSocketAddress, Long>());
List<Integer> expectedSet = new ArrayList<Integer>();
expectedSet.add(0);
expectedSet.add(3);
expectedSet.add(1);
expectedSet.add(2);
- LOG.info("reorder set : {}", reoderSet);
- assertFalse(reoderSet == writeSet);
- assertEquals(expectedSet, reoderSet);
+ LOG.info("reorder set : {}", reorderSet);
+ assertFalse(reorderSet == writeSet);
+ assertEquals(expectedSet, reorderSet);
}
@Test
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
