You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/06/27 23:40:36 UTC
svn commit: r1140333 - in /cassandra/branches/cassandra-0.8: CHANGES.txt
src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
Author: jbellis
Date: Mon Jun 27 21:40:36 2011
New Revision: 1140333
URL: http://svn.apache.org/viewvc?rev=1140333&view=rev
Log:
Add support for multiple (comma-delimited) coordinator addresses to CFIF
patch by Mck SembWever; reviewed by jbellis for CASSANDRA-2807
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1140333&r1=1140332&r2=1140333&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Jun 27 21:40:36 2011
@@ -5,6 +5,8 @@
* Expose number of threads blocked on submitting memtable to flush
(CASSANDRA-2817)
* add ability to return "endpoints" to nodetool (CASSANDRA-2776)
+ * Add support for multiple (comma-delimited) coordinator addresses
+ to ColumnFamilyInputFormat (CASSANDRA-2807)
0.8.1
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java?rev=1140333&r1=1140332&r2=1140333&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java Mon Jun 27 21:40:36 2011
@@ -214,7 +214,30 @@ public class ColumnFamilyInputFormat ext
private List<TokenRange> getRangeMap(Configuration conf) throws IOException
{
- Cassandra.Client client = createConnection(ConfigHelper.getInitialAddress(conf), ConfigHelper.getRpcPort(conf), true);
+ String[] addresses = ConfigHelper.getInitialAddress(conf).split(",");
+ Cassandra.Client client = null;
+ List<IOException> exceptions = new ArrayList<IOException>();
+ for (String address : addresses)
+ {
+ try
+ {
+ client = createConnection(address, ConfigHelper.getRpcPort(conf), true);
+ break;
+ }
+ catch (IOException ioe)
+ {
+ exceptions.add(ioe);
+ }
+ }
+ if (client == null)
+ {
+ logger.error("failed to connect to any initial addresses");
+ for (IOException ioe : exceptions)
+ {
+ logger.error("", ioe);
+ }
+ throw exceptions.get(exceptions.size() - 1);
+ }
List<TokenRange> map;
try