Author: jbellis
Date: Fri Aug 19 22:42:45 2011
New Revision: 1159807
URL: http://svn.apache.org/viewvc?rev=1159807&view=rev
Log:
fail jobs when Cassandra node has failed but TaskTracker has not
patch by Mck SembWever; reviewed by jbellis and brandonwilliams for
CASSANDRA-2388
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1159807&r1=1159806&r2=1159807&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Aug 19 22:42:45 2011
@@ -3,6 +3,8 @@
* log Java classpath on startup (CASSANDRA-2895)
* prune index scan resultset back to original request for lazy
resultset expansion case (CASSANDRA-2964)
+ * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker
+ has not (CASSANDRA-2388)
0.7.8
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java?rev=1159807&r1=1159806&r2=1159807&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
Fri Aug 19 22:42:45 2011
@@ -138,8 +138,6 @@ public class ColumnFamilyRecordReader ex
return true;
}
- // we don't use endpointsnitch since we are trying to support hadoop nodes
that are
- // not necessarily on Cassandra machines, too. This should be adequate
for single-DC clusters, at least.
private String getLocation()
{
InetAddress[] localAddresses;
@@ -170,7 +168,7 @@ public class ColumnFamilyRecordReader ex
}
}
}
- return split.getLocations()[0];
+ throw new UnsupportedOperationException("no local connection
available");
}
private class RowIterator extends AbstractIterator<Pair<ByteBuffer,
SortedMap<ByteBuffer, IColumn>>>
