cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject svn commit: r1174701 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/tools/BulkLoader.java
Date Fri, 23 Sep 2011 12:31:02 GMT
Author: slebresne
Date: Fri Sep 23 12:31:02 2011
New Revision: 1174701

URL: http://svn.apache.org/viewvc?rev=1174701&view=rev
Log:
fix sstableloader --ignores option
patch by slebresne; reviewed by jbellis for CASSANDRA-3247

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1174701&r1=1174700&r2=1174701&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Sep 23 12:31:02 2011
@@ -3,6 +3,7 @@
  * Allow using quotes in "USE <keyspace>;" CLI command (CASSANDRA-3208)
  * Log message when a full repair operation completes (CASSANDRA-3207)
  * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218)
+ * Fix sstableloader --ignores option (CASSANDRA-3247)
 
 
 0.8.6

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java?rev=1174701&r1=1174700&r2=1174701&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java Fri
Sep 23 12:31:02 2011
@@ -314,12 +314,12 @@ public class BulkLoader
                     {
                         for (String node : nodes)
                         {
-                            opts.ignores.add(InetAddress.getByName(node));
+                            opts.ignores.add(InetAddress.getByName(node.trim()));
                         }
                     }
                     catch (UnknownHostException e)
                     {
-                        errorMsg(e.getMessage(), options);
+                        errorMsg("Unknown host: " + e.getMessage(), options);
                     }
                 }
 
@@ -357,7 +357,7 @@ public class BulkLoader
             options.addOption("v",  VERBOSE_OPTION,      "verbose output");
             options.addOption("h",  HELP_OPTION,         "display this help message");
             options.addOption(null, NOPROGRESS_OPTION,   "don't display progress");
-            options.addOption("i",  IGNORE_NODES_OPTION, "don't stream to this (comma separated)
list of nodes");
+            options.addOption("i",  IGNORE_NODES_OPTION, "NODES", "don't stream to this (comma
separated) list of nodes");
             return options;
         }
 



Mime
View raw message