You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2022/05/05 11:03:21 UTC
[cassandra] branch cassandra-4.0 updated (4bab12c578 -> a524cd4907)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 4bab12c578 ninja-fix: CHANGES.txt for new 4.0.4 release candidate
new 61d4cccb0b Fix URISyntaxException in nodetool with updated Java
new aeced876b5 Merge branch 'cassandra-3.0' into cassandra-3.11
new a524cd4907 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a524cd4907bec475b71f1a9c75faecfadc6e6485
Merge: 4bab12c578 aeced876b5
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu May 5 05:55:11 2022 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 101aab3478,c63f2a1d87..0924155c04
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -105,12 -100,9 +105,12 @@@ import org.apache.cassandra.utils.Nativ
*/
public class NodeProbe implements AutoCloseable
{
- private static final String fmtUrl = "service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi";
+ private static final String fmtUrl = "service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
private static final String ssObjName = "org.apache.cassandra.db:type=StorageService";
private static final int defaultPort = 7199;
+
+ static long JMX_NOTIFICATION_POLL_INTERVAL_SECONDS = Long.getLong("cassandra.nodetool.jmx_notification_poll_interval_seconds", TimeUnit.SECONDS.convert(5, TimeUnit.MINUTES));
+
final String host;
final int port;
private String username;
@@@ -200,8 -190,14 +200,14 @@@
*/
protected void connect() throws IOException
{
+ String host = this.host;
+ if (host.contains(":"))
+ {
+ // Use square brackets to surround IPv6 addresses to fix CASSANDRA-7669 and CASSANDRA-17581
+ host = "[" + host + "]";
+ }
JMXServiceURL jmxUrl = new JMXServiceURL(String.format(fmtUrl, host, port));
- Map<String,Object> env = new HashMap<String,Object>();
+ Map<String, Object> env = new HashMap<String, Object>();
if (username != null)
{
String[] creds = { username, password };
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org