You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by as...@apache.org on 2009/06/17 22:06:25 UTC
svn commit: r785772 - in /hadoop/chukwa/branches/chukwa-0.2: CHANGES.txt
bin/VERSION
src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
Author: asrabkin
Date: Wed Jun 17 20:06:24 2009
New Revision: 785772
URL: http://svn.apache.org/viewvc?rev=785772&view=rev
Log:
CHUKWA-301. Set TestFileExpirationPolicy controller port to 0 to avoid race condition. Contributed by Jerome Boulon.
Modified:
hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
hadoop/chukwa/branches/chukwa-0.2/bin/VERSION
hadoop/chukwa/branches/chukwa-0.2/src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
Modified: hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt?rev=785772&r1=785771&r2=785772&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt (original)
+++ hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt Wed Jun 17 20:06:24 2009
@@ -64,6 +64,8 @@
BUG FIXES
+ CHUKWA-301. Set TestFileExpirationPolicy controller port to 0 to avoid race condition. (Jerome Boulon via asrabkin)
+
CHUKWA-302. Removed hard coded dependency of Hadoop jar file. (Eric Yang)
CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)
Modified: hadoop/chukwa/branches/chukwa-0.2/bin/VERSION
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/bin/VERSION?rev=785772&r1=785771&r2=785772&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/bin/VERSION (original)
+++ hadoop/chukwa/branches/chukwa-0.2/bin/VERSION Wed Jun 17 20:06:24 2009
@@ -1 +1 @@
-0.1.2
+0.2.0
Modified: hadoop/chukwa/branches/chukwa-0.2/src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java?rev=785772&r1=785771&r2=785772&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java (original)
+++ hadoop/chukwa/branches/chukwa-0.2/src/test/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileExpirationPolicy.java Wed Jun 17 20:06:24 2009
@@ -26,6 +26,7 @@
import org.apache.hadoop.chukwa.conf.ChukwaConfiguration;
import org.apache.hadoop.chukwa.datacollection.agent.ChukwaAgent;
import org.apache.hadoop.chukwa.datacollection.controller.ChukwaAgentController;
+import org.apache.hadoop.conf.Configuration;
public class TestFileExpirationPolicy extends TestCase {
@@ -33,11 +34,13 @@
ChukwaAgent agent = null;
try {
- agent = new ChukwaAgent();
+ Configuration conf = new ChukwaConfiguration();
+ conf.set("chukwaAgent.control.port", "0");
+ agent = new ChukwaAgent(conf);
// Remove any adaptor left over from previous run
- ChukwaConfiguration cc = new ChukwaConfiguration();
- int portno = cc.getInt("chukwaAgent.control.port", 9093);
- ChukwaAgentController cli = new ChukwaAgentController("localhost", portno);
+
+
+ ChukwaAgentController cli = new ChukwaAgentController("localhost", agent.getControllerPort());
cli.removeAll();
// sleep for some time to make sure we don't get chunk from existing
// streams
@@ -78,11 +81,12 @@
String logFile = tempDir.getPath() + "/chukwatestExpiration.txt";
testFile = makeTestFile(logFile, 8000);
- agent = new ChukwaAgent();
+ Configuration conf = new ChukwaConfiguration();
+ conf.set("chukwaAgent.control.port", "0");
+ agent = new ChukwaAgent(conf);
// Remove any adaptor left over from previous run
- ChukwaConfiguration cc = new ChukwaConfiguration();
- int portno = cc.getInt("chukwaAgent.control.port", 9093);
- ChukwaAgentController cli = new ChukwaAgentController("localhost", portno);
+
+ ChukwaAgentController cli = new ChukwaAgentController("localhost", agent.getControllerPort());
cli.removeAll();
// sleep for some time to make sure we don't get chunk from existing
// streams