Author: todd
Date: Wed Jan 23 20:01:33 2013
New Revision: 1437680
URL: http://svn.apache.org/viewvc?rev=1437680&view=rev
Log:
HDFS-4433. Make TestPeerCache not flaky. Contributed by Colin Patrick McCabe.
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt?rev=1437680&r1=1437679&r2=1437680&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
(original)
+++
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-347.txt
Wed Jan 23 20:01:33 2013
@@ -33,3 +33,5 @@ HDFS-4416. Rename dfs.datanode.domain.so
HDFS-4417. Fix case where local reads get disabled incorrectly
(Colin Patrick McCabe and todd via todd)
+
+HDFS-4433. Make TestPeerCache not flaky (Colin Patrick McCabe via todd)
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/PeerCache.java?rev=1437680&r1=1437679&r2=1437680&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
(original)
+++
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
Wed Jan 23 20:01:33 2013
@@ -83,32 +83,35 @@ class PeerCache {
private Daemon daemon;
/** A map for per user per datanode. */
- private static LinkedListMultimap<Key, Value> multimap =
+ private final LinkedListMultimap<Key, Value> multimap =
LinkedListMultimap.create();
- private static int capacity;
- private static long expiryPeriod;
- private static PeerCache instance = new PeerCache();
- private static boolean isInitedOnce = false;
+ private final int capacity;
+ private final long expiryPeriod;
+ private static PeerCache instance = null;
+
+ @VisibleForTesting
+ PeerCache(int c, long e) {
+ this.capacity = c;
+ this.expiryPeriod = e;
+
+ if (capacity == 0 ) {
+ LOG.info("SocketCache disabled.");
+ }
+ else if (expiryPeriod == 0) {
+ throw new IllegalStateException("Cannot initialize expiryPeriod to " +
+ expiryPeriod + "when cache is enabled.");
+ }
+ }
public static synchronized PeerCache getInstance(int c, long e) {
// capacity is only initialized once
- if (isInitedOnce == false) {
- capacity = c;
- expiryPeriod = e;
-
- if (capacity == 0 ) {
- LOG.info("SocketCache disabled.");
- }
- else if (expiryPeriod == 0) {
- throw new IllegalStateException("Cannot initialize expiryPeriod to " +
- expiryPeriod + "when cache is enabled.");
- }
- isInitedOnce = true;
+ if (instance == null) {
+ instance = new PeerCache(c, e);
} else { //already initialized once
- if (capacity != c || expiryPeriod != e) {
- LOG.info("capacity and expiry periods already set to " + capacity +
- " and " + expiryPeriod + " respectively. Cannot set it to " + c +
- " and " + e);
+ if (instance.capacity != c || instance.expiryPeriod != e) {
+ LOG.info("capacity and expiry periods already set to " +
+ instance.capacity + " and " + instance.expiryPeriod +
+ " respectively. Cannot set it to " + c + " and " + e);
}
}
@@ -267,5 +270,18 @@ class PeerCache {
}
multimap.clear();
}
-
+
+ @VisibleForTesting
+ void close() {
+ clear();
+ if (daemon != null) {
+ daemon.interrupt();
+ try {
+ daemon.join();
+ } catch (InterruptedException e) {
+ throw new RuntimeException("failed to join thread");
+ }
+ }
+ daemon = null;
+ }
}
Modified:
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java?rev=1437680&r1=1437679&r2=1437680&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
(original)
+++
hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
Wed Jan 23 20:01:33 2013
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.ReadableByteChannel;
-import java.util.HashSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,12 +36,11 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import com.google.common.collect.HashMultiset;
+
public class TestPeerCache {
static final Log LOG = LogFactory.getLog(TestPeerCache.class);
- private static final int CAPACITY = 3;
- private static final int EXPIRY_PERIOD = 20;
-
private static class FakePeer implements Peer {
private boolean closed = false;
private final boolean hasDomain;
@@ -132,11 +130,24 @@ public class TestPeerCache {
throw new RuntimeException("injected fault.");
} });
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof FakePeer)) return false;
+ FakePeer other = (FakePeer)o;
+ return hasDomain == other.hasDomain &&
+ dnId.equals(other.dnId);
+ }
+
+ @Override
+ public int hashCode() {
+ return dnId.hashCode() ^ (hasDomain ? 1 : 0);
+ }
}
@Test
public void testAddAndRetrieve() throws Exception {
- PeerCache cache = PeerCache.getInstance(3, 100000);
+ PeerCache cache = new PeerCache(3, 100000);
DatanodeID dnId = new DatanodeID("192.168.0.1",
"fakehostname", "fake_storage_id",
100, 101, 102);
@@ -146,14 +157,14 @@ public class TestPeerCache {
assertEquals(1, cache.size());
assertEquals(peer, cache.get(dnId, false));
assertEquals(0, cache.size());
- cache.clear();
+ cache.close();
}
@Test
public void testExpiry() throws Exception {
final int CAPACITY = 3;
final int EXPIRY_PERIOD = 10;
- PeerCache cache = PeerCache.getInstance(CAPACITY, EXPIRY_PERIOD);
+ PeerCache cache = new PeerCache(CAPACITY, EXPIRY_PERIOD);
DatanodeID dnIds[] = new DatanodeID[CAPACITY];
FakePeer peers[] = new FakePeer[CAPACITY];
for (int i = 0; i < CAPACITY; ++i) {
@@ -178,13 +189,13 @@ public class TestPeerCache {
// sleep for another second and see if
// the daemon thread runs fine on empty cache
Thread.sleep(EXPIRY_PERIOD * 50);
- cache.clear();
+ cache.close();
}
@Test
public void testEviction() throws Exception {
final int CAPACITY = 3;
- PeerCache cache = PeerCache.getInstance(CAPACITY, 100000);
+ PeerCache cache = new PeerCache(CAPACITY, 100000);
DatanodeID dnIds[] = new DatanodeID[CAPACITY + 1];
FakePeer peers[] = new FakePeer[CAPACITY + 1];
for (int i = 0; i < dnIds.length; ++i) {
@@ -212,17 +223,17 @@ public class TestPeerCache {
peer.close();
}
assertEquals(1, cache.size());
- cache.clear();
+ cache.close();
}
@Test
- public void testMultiplePeersWithSameDnId() throws Exception {
+ public void testMultiplePeersWithSameKey() throws Exception {
final int CAPACITY = 3;
- PeerCache cache = PeerCache.getInstance(CAPACITY, 100000);
+ PeerCache cache = new PeerCache(CAPACITY, 100000);
DatanodeID dnId = new DatanodeID("192.168.0.1",
"fakehostname", "fake_storage_id",
100, 101, 102);
- HashSet<FakePeer> peers = new HashSet<FakePeer>(CAPACITY);
+ HashMultiset<FakePeer> peers = HashMultiset.create(CAPACITY);
for (int i = 0; i < CAPACITY; ++i) {
FakePeer peer = new FakePeer(dnId, false);
peers.add(peer);
@@ -237,17 +248,17 @@ public class TestPeerCache {
peers.remove(peer);
}
assertEquals(0, cache.size());
- cache.clear();
+ cache.close();
}
@Test
public void testDomainSocketPeers() throws Exception {
final int CAPACITY = 3;
- PeerCache cache = PeerCache.getInstance(CAPACITY, 100000);
+ PeerCache cache = new PeerCache(CAPACITY, 100000);
DatanodeID dnId = new DatanodeID("192.168.0.1",
"fakehostname", "fake_storage_id",
100, 101, 102);
- HashSet<FakePeer> peers = new HashSet<FakePeer>(CAPACITY);
+ HashMultiset<FakePeer> peers = HashMultiset.create(CAPACITY);
for (int i = 0; i < CAPACITY; ++i) {
FakePeer peer = new FakePeer(dnId, i == CAPACITY - 1);
peers.add(peer);
@@ -272,6 +283,6 @@ public class TestPeerCache {
peers.remove(peer);
}
assertEquals(0, cache.size());
- cache.clear();
+ cache.close();
}
}
