You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2012/08/08 05:42:48 UTC
git commit: FLUME-1434. Fix unit test failures caused by previous
patch for FLUME-1434.
Updated Branches:
refs/heads/trunk 303076f2c -> 525fb2336
FLUME-1434. Fix unit test failures caused by previous patch for FLUME-1434.
(Brock Noland via Hari Shreedharan)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/525fb233
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/525fb233
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/525fb233
Branch: refs/heads/trunk
Commit: 525fb2336a6ccf049b9297384fa8bc90146f130f
Parents: 303076f
Author: Hari Shreedharan <hs...@apache.org>
Authored: Tue Aug 7 20:41:17 2012 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Tue Aug 7 20:41:17 2012 -0700
----------------------------------------------------------------------
.../apache/flume/channel/file/TestFileChannel.java | 6 +++-
.../org/apache/flume/channel/file/TestLog.java | 22 +++++++++-----
2 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/525fb233/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannel.java
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannel.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannel.java
index 5f7c83e..681ebcc 100644
--- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannel.java
+++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestFileChannel.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -76,6 +77,7 @@ public class TestFileChannel {
}
private FileChannel createFileChannel() {
FileChannel channel = new FileChannel();
+ channel.setName("fc-" + UUID.randomUUID()); // fixes mbean error
context.put(FileChannelConfiguration.CHECKPOINT_DIR,
checkpointDir.getAbsolutePath());
context.put(FileChannelConfiguration.DATA_DIRS, dataDir);
@@ -105,7 +107,7 @@ public class TestFileChannel {
in.addAll(putEvents(channel, "restart", 1, 1));
}
} catch (ChannelException e) {
- Assert.assertEquals("Cannot acquire capacity. [channel=null]",
+ Assert.assertEquals("Cannot acquire capacity. [channel="+channel.getName()+"]",
e.getMessage());
}
channel.stop();
@@ -123,7 +125,7 @@ public class TestFileChannel {
in.addAll(putEvents(channel, "restart", 1, 1));
}
} catch (ChannelException e) {
- Assert.assertEquals("Cannot acquire capacity. [channel=null]",
+ Assert.assertEquals("Cannot acquire capacity. [channel="+channel.getName()+"]",
e.getMessage());
}
Configurables.configure(channel, context);
http://git-wip-us.apache.org/repos/asf/flume/blob/525fb233/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java
index f286b66..b243f5a 100644
--- a/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java
+++ b/flume-ng-channels/flume-file-channel/src/test/java/org/apache/flume/channel/file/TestLog.java
@@ -48,7 +48,8 @@ public class TestLog {
}
log = new Log.Builder().setCheckpointInterval(1L).setMaxFileSize(
MAX_FILE_SIZE).setQueueSize(CAPACITY).setCheckpointDir(
- checkpointDir).setLogDirs(dataDirs).build();
+ checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
}
@After
@@ -117,7 +118,7 @@ public class TestLog {
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
CAPACITY).setCheckpointDir(checkpointDir).setLogDirs(
- dataDirs).build();
+ dataDirs).setChannelName("testlog").build();
log.replay();
System.out.println(log.getNextFileID());
takeAndVerify(eventPointerIn, eventIn);
@@ -137,7 +138,7 @@ public class TestLog {
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
CAPACITY).setCheckpointDir(checkpointDir).setLogDirs(
- dataDirs).build();
+ dataDirs).setChannelName("testlog").build();
log.replay();
FlumeEventQueue queue = log.getFlumeEventQueue();
Assert.assertNull(queue.removeHead());
@@ -160,7 +161,8 @@ public class TestLog {
new Log.Builder().setCheckpointInterval(
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
- 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs).build();
+ 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
FlumeEventQueue queue = log.getFlumeEventQueue();
Assert.assertNull(queue.removeHead());
@@ -183,7 +185,8 @@ public class TestLog {
new Log.Builder().setCheckpointInterval(
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
- 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs).build();
+ 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
takeAndVerify(eventPointerIn, eventIn);
}
@@ -196,7 +199,8 @@ public class TestLog {
new Log.Builder().setCheckpointInterval(
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
- 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs).build();
+ 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
FlumeEventQueue queue = log.getFlumeEventQueue();
FlumeEventPointer eventPointerOut = queue.removeHead();
@@ -211,7 +215,8 @@ public class TestLog {
new Log.Builder().setCheckpointInterval(
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
- 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs).build();
+ 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
FlumeEventQueue queue = log.getFlumeEventQueue();
FlumeEventPointer eventPointerOut = queue.removeHead();
@@ -226,7 +231,8 @@ public class TestLog {
new Log.Builder().setCheckpointInterval(
Long.MAX_VALUE).setMaxFileSize(
FileChannelConfiguration.DEFAULT_MAX_FILE_SIZE).setQueueSize(
- 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs).build();
+ 1).setCheckpointDir(checkpointDir).setLogDirs(dataDirs)
+ .setChannelName("testlog").build();
log.replay();
FlumeEventQueue queue = log.getFlumeEventQueue();
FlumeEventPointer eventPointerOut = queue.removeHead();