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/87b0338a Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/87b0338a Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/87b0338a Branch: refs/heads/cdh-1.2.0+24_intuit Commit: 87b0338a41a002f1f992df9b69ba36bd07d7901a Parents: e349aee Author: Hari Shreedharan <[email protected]> Authored: Tue Aug 7 20:41:17 2012 -0700 Committer: Mike Percy <[email protected]> Committed: Fri Sep 7 14:03:04 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/87b0338a/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/87b0338a/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();
