Author: jbellis
Date: Wed Aug 3 21:13:49 2011
New Revision: 1153668
URL: http://svn.apache.org/viewvc?rev=1153668&view=rev
Log:
include files-to-be-streamed in StreamInSession.getSources
patch by Yuki Morishita; reviewed by jbellis for CASSANDRA-2972
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamInSession.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1153668&r1=1153667&r2=1153668&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Aug 3 21:13:49 2011
@@ -34,6 +34,7 @@
* add asynchronous and half-sync/half-async thrift servers (CASSANDRA-1405)
* fix potential use of free'd native memory in SerializingCache
(CASSANDRA-2951)
+ * include files-to-be-streamed in StreamInSession.getSources (CASSANDRA-2972)
0.8.2
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java?rev=1153668&r1=1153667&r2=1153668&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
Wed Aug 3 21:13:49 2011
@@ -108,11 +108,11 @@ public class IncomingStreamReader
{
long toRead = Math.min(FileStreamTask.CHUNK_SIZE, length - bytesRead);
long lastRead = fc.transferFrom(socketChannel, offset + bytesRead,
toRead);
- // if the other side fails, we will not get an exception, but instead
transferFrom will constantly return 0 byte read
- // and we would thus enter an infinite loop. So intead, if no bytes are
tranferred we assume the other side is dead and
- // raise an exception (that will be catch belove and 'the right thing'
will be done).
- if (lastRead == 0)
- throw new IOException("Transfer failed for remote file " +
remoteFile);
+ // if the other side fails, we will not get an exception, but instead
transferFrom will constantly return 0 byte read
+ // and we would thus enter an infinite loop. So intead, if no bytes
are tranferred we assume the other side is dead and
+ // raise an exception (that will be catch belove and 'the right thing'
will be done).
+ if (lastRead == 0)
+ throw new IOException("Transfer failed for remote file " +
remoteFile);
bytesRead += lastRead;
remoteFile.progress += lastRead;
return bytesRead;
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamInSession.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamInSession.java?rev=1153668&r1=1153667&r2=1153668&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamInSession.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamInSession.java
Wed Aug 3 21:13:49 2011
@@ -203,10 +203,9 @@ public class StreamInSession
if (entry.getKey().left.equals(host))
{
StreamInSession session = entry.getValue();
- set.addAll(session.files);
- if(session.current != null) {
+ if (session.current != null)
set.add(session.current);
- }
+ set.addAll(session.files);
}
}
return set;
