You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/03/07 14:37:07 UTC
[06/10] cassandra git commit: Unresolved hostname leads to replace
being ignored
Unresolved hostname leads to replace being ignored
patch by Jan Karlsson, reviewed by Sankalp Kohli for CASSANDRA-11210
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1543290f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1543290f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1543290f
Branch: refs/heads/cassandra-3.5
Commit: 1543290f14ef73ee496532610fe027bb29060b29
Parents: 8e9622a
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:31:52 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:31:52 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7204098..4eef41f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,7 @@ Merged from 2.1:
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
* Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
* Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1543290f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7bcfb97..2c5e603 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -951,7 +951,7 @@ public class DatabaseDescriptor
}
catch (UnknownHostException e)
{
- return null;
+ throw new RuntimeException("Replacement ost name could not be resolved or scope_id was specified for a global IPv6 address", e);
}
}