You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by jm...@apache.org on 2011/08/17 16:29:04 UTC
svn commit: r1158737 - in /incubator/flume/trunk/flume-core/src:
main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java
test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java
Author: jmhsieh
Date: Wed Aug 17 14:29:03 2011
New Revision: 1158737
URL: http://svn.apache.org/viewvc?rev=1158737&view=rev
Log:
FLUME-742: TestAvroSink fails (Tom White)
Modified:
incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java
incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java
Modified: incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java?rev=1158737&r1=1158736&r2=1158737&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java (original)
+++ incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/handlers/avro/AvroEventSink.java Wed Aug 17 14:29:03 2011
@@ -105,7 +105,7 @@ public class AvroEventSink extends Event
public void close() throws IOException {
if (transport != null) {
transport.close();
- transport = null;
+ // we don't null out the transport, so getSentBytes can be called
LOG.info("AvroEventSink on port " + port + " closed");
} else {
LOG.warn("Trying to close AvroEventSink, which was closed already");
Modified: incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java?rev=1158737&r1=1158736&r2=1158737&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java (original)
+++ incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/handlers/avro/TestAvroSinks.java Wed Aug 17 14:29:03 2011
@@ -216,7 +216,9 @@ public class TestAvroSinks implements Ex
tes.close();
assertEquals(25 * threads, cnt.getCount());
ReportEvent rpt = tes.getMetrics();
- assertEquals(2500 * threads, sendByteSum.get());
+ assertTrue("Wire bytes " + sendByteSum.get() +
+ " should exceed total message length",
+ sendByteSum.get() >= 2500 * threads);
assertEquals(2500 * threads, rpt.getLongMetric(AvroEventSource.A_BYTES_IN)
.longValue());
assertEquals(25 * threads, rpt.getLongMetric(AvroEventSource.A_DEQUEUED)