natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix streaming to catch exception so retry not fail 

patch by yukim; reviewed by Paulo Motta for CASSANDRA-10557
This commit is contained in:
Yuki Morishita 2015-10-20 14:25:55 -05:00
parent 986a1a7694
commit 068614ccc7
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.12
* Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
* Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
* Support encrypted and plain traffic on the same port (CASSANDRA-10559)
* Do STCS in DTCS windows (CASSANDRA-10276)

16
src/java/org/apache/cassandra/streaming/StreamReader.java
View File

@ -89,11 +89,12 @@ public class StreamReader
}
ColumnFamilyStore cfs = Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
SSTableWriter writer = createWriter(cfs, totalSize, repairedAt);
DataInputStream dis = new DataInputStream(new LZFInputStream(Channels.newInputStream(channel)));
BytesReadTracker in = new BytesReadTracker(dis);
SSTableWriter writer = null;
try
{
writer = createWriter(cfs, totalSize, repairedAt);
while (in.getBytesRead() < totalSize)
{
writeRow(writer, in, cfs);
@ -104,7 +105,18 @@ public class StreamReader
}
catch (Throwable e)
{
writer.abort();
if (writer != null)
{
try
{
writer.abort();
}
catch (Throwable e2)
{
// add abort error to original and continue so we can drain unread stream
e.addSuppressed(e2);
}
}
drain(dis, in.getBytesRead());
if (e instanceof IOException)
throw (IOException) e;

17
src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
View File

@ -72,12 +72,12 @@ public class CompressedStreamReader extends StreamReader
}
ColumnFamilyStore cfs = Keyspace.open(kscf.left).getColumnFamilyStore(kscf.right);
SSTableWriter writer = createWriter(cfs, totalSize, repairedAt);
CompressedInputStream cis = new CompressedInputStream(Channels.newInputStream(channel), compressionInfo, inputVersion.hasPostCompressionAdlerChecksums);
BytesReadTracker in = new BytesReadTracker(new DataInputStream(cis));
SSTableWriter writer = null;
try
{
writer = createWriter(cfs, totalSize, repairedAt);
for (Pair<Long, Long> section : sections)
{
long length = section.right - section.left;
@ -95,7 +95,18 @@ public class CompressedStreamReader extends StreamReader
}
catch (Throwable e)
{
writer.abort();
if (writer != null)
{
try
{
writer.abort();
}
catch (Throwable e2)
{
// add abort error to original and continue so we can drain unread stream
e.addSuppressed(e2);
}
}
drain(cis, in.getBytesRead());
if (e instanceof IOException)
throw (IOException) e;