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:02 UTC

[01/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 90fd8deed -> a956e9fe0
  refs/heads/cassandra-3.0 9c3855b5f -> 1543290f1
  refs/heads/cassandra-3.5 8c83c8eda -> ad8673cc6
  refs/heads/trunk 6e69c7590 -> 7d9989145


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/a956e9fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a956e9fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a956e9fe

Branch: refs/heads/cassandra-2.2
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:27:58 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/a956e9fe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
    (CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/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 cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
         }
         catch (UnknownHostException e)
         {
-            return null;
+            throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
         }
     }

[07/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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.0
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);
         }
     }

[03/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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/a956e9fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a956e9fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a956e9fe

Branch: refs/heads/cassandra-3.5
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:27:58 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/a956e9fe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
    (CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/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 cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
         }
         catch (UnknownHostException e)
         {
-            return null;
+            throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
         }
     }

[09/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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/ad8673cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad8673cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad8673cc

Branch: refs/heads/cassandra-3.5
Commit: ad8673cc6b021e9dac188cfc3ec18ea6f9c0bfdc
Parents: 66fa1d4
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:34:24 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:34:24 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/ad8673cc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
    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)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8673cc/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 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
         }
         catch (UnknownHostException e)
         {
-            return null;
+            throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
         }
     }

[04/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e9622a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e9622a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e9622a1

Branch: refs/heads/cassandra-3.0
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:29:23 2016 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------

[06/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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);
         }
     }

[02/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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/a956e9fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a956e9fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a956e9fe

Branch: refs/heads/cassandra-3.0
Commit: a956e9fe0c1172241892d9e80cb23b12a19a8419
Parents: 90fd8de
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:27:58 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:27:58 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/a956e9fe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5631a28..a6d6a14 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Fix filtering on non-primary key columns for thrift static column families
    (CASSANDRA-6377)
  * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a956e9fe/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 cbea2ff..afae298 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,7 +912,7 @@ public class DatabaseDescriptor
         }
         catch (UnknownHostException e)
         {
-            return null;
+            throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
         }
     }

[10/10] cassandra git commit: Unresolved hostname leads to replace being ignored

Posted by ja...@apache.org.
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/7d998914
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d998914
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d998914

Branch: refs/heads/trunk
Commit: 7d998914506450fffdc70ed11c426c8e1ac1cd20
Parents: 6e69c75
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:36:04 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:36:04 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/7d998914/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c21d66..9699bfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,6 +63,7 @@ Merged from 3.0:
    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)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d998914/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 7057c37..b917aec 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1016,7 +1016,7 @@ public class DatabaseDescriptor
         }
         catch (UnknownHostException e)
         {
-            return null;
+            throw new RuntimeException("Replacement host name could not be resolved or scope_id was specified for a global IPv6 address", e);
         }
     }

[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e9622a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e9622a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e9622a1

Branch: refs/heads/cassandra-3.5
Commit: 8e9622a1198a0758f3290a5fc655adcca7d10599
Parents: 9c3855b a956e9f
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:29:23 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:29:23 2016 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66fa1d49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66fa1d49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66fa1d49

Branch: refs/heads/cassandra-3.5
Commit: 66fa1d492c5875b02a9c864c6c9e47093d2c5c2c
Parents: 8c83c8e 1543290
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Mar 7 05:32:51 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Mar 7 05:32:51 2016 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------