Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12588. addendum patch to fix intermittent failure of TestGangliaMetrics. (iwasakims) 

(cherry picked from commit 67089875f0)
This commit is contained in:
Masatake Iwasaki 2016-06-22 23:38:20 +09:00
parent 6a1fc34595
commit 01f5e609a2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
View File

@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.commons.io.Charsets; import org.apache.commons.io.Charsets;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -99,7 +98,9 @@ public class TestGangliaMetrics {
} }
@Test public void testGangliaMetrics2() throws Exception { @Test public void testGangliaMetrics2() throws Exception {
ConfigBuilder cb = new ConfigBuilder().add("default.period", 10) // Setting long interval to avoid periodic publishing.
// We manually publish metrics by MeticsSystem#publishMetricsNow here.
ConfigBuilder cb = new ConfigBuilder().add("*.period", 120)
.add("test.sink.gsink30.context", "test") // filter out only "test" .add("test.sink.gsink30.context", "test") // filter out only "test"
.add("test.sink.gsink31.context", "test") // filter out only "test" .add("test.sink.gsink31.context", "test") // filter out only "test"
.save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test")); .save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test"));
@ -196,14 +197,14 @@ public class TestGangliaMetrics {
* @throws SocketException * @throws SocketException
*/ */
public MockDatagramSocket() throws SocketException { public MockDatagramSocket() throws SocketException {
capture = new CopyOnWriteArrayList<byte[]>(); capture = new ArrayList<byte[]>();
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see java.net.DatagramSocket#send(java.net.DatagramPacket) * @see java.net.DatagramSocket#send(java.net.DatagramPacket)
*/ */
@Override @Override
public void send(DatagramPacket p) throws IOException { public synchronized void send(DatagramPacket p) throws IOException {
// capture the byte arrays // capture the byte arrays
byte[] bytes = new byte[p.getLength()]; byte[] bytes = new byte[p.getLength()];
System.arraycopy(p.getData(), p.getOffset(), bytes, 0, p.getLength()); System.arraycopy(p.getData(), p.getOffset(), bytes, 0, p.getLength());
@ -213,7 +214,7 @@ public class TestGangliaMetrics {
/** /**
* @return the captured byte arrays * @return the captured byte arrays
*/ */
List<byte[]> getCapturedSend() { synchronized List<byte[]> getCapturedSend() {
return capture; return capture;
} }
} }