[jira] [Commented] (CASSANDRA-6811) nodetool no longer shows node joining
[
https://issues.apache.org/jira/browse/CASSANDRA-6811?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13925321#comment-13925321
]
Vijay commented on CASSANDRA-6811:
--
Thanks, +1 and committed...
Inlined the comparison and replaced the empty string with ?
{code}
Note: Ownership information does not include topology; for complete
information, specify a keyspace
Datacenter: datacenter1
==
Address RackStatus State LoadOwns
Token
17.198.227.158 rack1 Up Joining 9.44 KB ?
-7564491331177403445
17.198.227.157 rack1 Up Normal 14.03 KB100.00%
-2195150324932625854
-bash-4.1$ ./apache-cassandra-1.2.15-SNAPSHOT/bin/nodetool ring
Note: Ownership information does not include topology; for complete
information, specify a keyspace
Datacenter: datacenter1
==
Address RackStatus State LoadOwns
Token
-2195150324932625854
17.198.227.158 rack1 Up Normal 10.77 KB70.89%
-7564491331177403445
17.198.227.157 rack1 Up Normal 14.03 KB29.11%
-2195150324932625854
-bash-4.1$ ./apache-cassandra-1.2.15-SNAPSHOT/bin/nodetool ring
Note: Ownership information does not include topology; for complete
information, specify a keyspace
Datacenter: datacenter1
==
Address RackStatus State LoadOwns
Token
-2195150324932625854
17.198.227.158 rack1 Up Leaving 10.77 KB70.89%
-7564491331177403445
17.198.227.157 rack1 Up Normal 14.03 KB29.11%
-2195150324932625854
{code}
nodetool no longer shows node joining
-
Key: CASSANDRA-6811
URL: https://issues.apache.org/jira/browse/CASSANDRA-6811
Project: Cassandra
Issue Type: Bug
Components: Core
Reporter: Brandon Williams
Assignee: Vijay
Priority: Minor
Fix For: 1.2.16
Attachments: ringfix.txt
When we added effective ownership output to nodetool ring/status, we
accidentally began excluding joining nodes because we iterate the ownership
maps instead of the the endpoint to token map when printing the output, and
the joining nodes don't have any ownership. The simplest thing to do is
probably iterate the token map instead, and not output any ownership info for
joining nodes.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 1e1129c61 - 57f6f9291
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f6f929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f6f929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f6f929
Branch: refs/heads/cassandra-1.2
Commit: 57f6f9291d5d8351dce2d493e87fdc5e62c4ebcd
Parents: 1e1129c
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 13:55:32 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 13:55:32 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++-
1 file changed, 39 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f6f929/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java
b/src/java/org/apache/cassandra/tools/NodeCmd.java
index e14ba1a..75af915 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -328,42 +328,49 @@ public class NodeCmd
else
outs.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-}
-catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
-? Down
-: ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
-? loadMap.get(endpoint)
-: ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-outs.printf(format, endpoint, rack, status, state, load, owns,
token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+outs.printf(format, endpoint, rack, status, state, load, owns,
entry.getValue());
}
outs.println();
}
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d2c3fe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2c3fe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2c3fe6 Branch: refs/heads/cassandra-2.0 Commit: 8d2c3fe6737c208a889f8516eb86a8568a5916c5 Parents: 8f0952e 57f6f92 Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 14:00:17 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 14:00:17 2014 -0700 -- .../org/apache/cassandra/tools/NodeCmd.java | 71 +++- 1 file changed, 39 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2c3fe6/src/java/org/apache/cassandra/tools/NodeCmd.java --
[1/2] git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 8f0952eb5 - 8d2c3fe67
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f6f929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f6f929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f6f929
Branch: refs/heads/cassandra-2.0
Commit: 57f6f9291d5d8351dce2d493e87fdc5e62c4ebcd
Parents: 1e1129c
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 13:55:32 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 13:55:32 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++-
1 file changed, 39 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f6f929/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java
b/src/java/org/apache/cassandra/tools/NodeCmd.java
index e14ba1a..75af915 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -328,42 +328,49 @@ public class NodeCmd
else
outs.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-}
-catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
-? Down
-: ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
-? loadMap.get(endpoint)
-: ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-outs.printf(format, endpoint, rack, status, state, load, owns,
token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+outs.printf(format, endpoint, rack, status, state, load, owns,
entry.getValue());
}
outs.println();
}
git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/trunk baa2b692d - 67ba0507c
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67ba0507
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67ba0507
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67ba0507
Branch: refs/heads/trunk
Commit: 67ba0507cdde9389bdd79044be6bf8960a8d67c1
Parents: baa2b69
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 14:48:11 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 14:48:11 2014 -0700
--
.../org/apache/cassandra/tools/NodeTool.java| 70 +++-
1 file changed, 39 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67ba0507/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index d24e013..5120739 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -506,41 +506,49 @@ public class NodeTool
else
System.out.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-} catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
- ? Down
- : ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
- ? loadMap.get(endpoint)
- : ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-System.out.printf(format, endpoint, rack, status, state,
load, owns, token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+System.out.printf(format, endpoint, rack, status, state, load,
owns, entry.getValue());
}
System.out.println();
}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5968f7b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5968f7b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5968f7b2 Branch: refs/heads/trunk Commit: 5968f7b2e87929bb5884b1711a8f4712f12d030d Parents: 67ba050 8d2c3fe Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 14:52:17 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 14:52:17 2014 -0700 -- --
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d2c3fe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2c3fe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2c3fe6 Branch: refs/heads/trunk Commit: 8d2c3fe6737c208a889f8516eb86a8568a5916c5 Parents: 8f0952e 57f6f92 Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 14:00:17 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 14:00:17 2014 -0700 -- .../org/apache/cassandra/tools/NodeCmd.java | 71 +++- 1 file changed, 39 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2c3fe6/src/java/org/apache/cassandra/tools/NodeCmd.java --
[1/3] git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/trunk 67ba0507c - 5968f7b2e
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f6f929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f6f929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f6f929
Branch: refs/heads/trunk
Commit: 57f6f9291d5d8351dce2d493e87fdc5e62c4ebcd
Parents: 1e1129c
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 13:55:32 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 13:55:32 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++-
1 file changed, 39 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f6f929/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java
b/src/java/org/apache/cassandra/tools/NodeCmd.java
index e14ba1a..75af915 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -328,42 +328,49 @@ public class NodeCmd
else
outs.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-}
-catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
-? Down
-: ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
-? loadMap.get(endpoint)
-: ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-outs.printf(format, endpoint, rack, status, state, load, owns,
token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+outs.printf(format, endpoint, rack, status, state, load, owns,
entry.getValue());
}
outs.println();
}
[jira] [Resolved] (CASSANDRA-6811) nodetool no longer shows node joining
[ https://issues.apache.org/jira/browse/CASSANDRA-6811?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay resolved CASSANDRA-6811. -- Resolution: Fixed nodetool no longer shows node joining - Key: CASSANDRA-6811 URL: https://issues.apache.org/jira/browse/CASSANDRA-6811 Project: Cassandra Issue Type: Bug Components: Core Reporter: Brandon Williams Assignee: Vijay Priority: Minor Fix For: 1.2.16 Attachments: ringfix.txt When we added effective ownership output to nodetool ring/status, we accidentally began excluding joining nodes because we iterate the ownership maps instead of the the endpoint to token map when printing the output, and the joining nodes don't have any ownership. The simplest thing to do is probably iterate the token map instead, and not output any ownership info for joining nodes. -- This message was sent by Atlassian JIRA (v6.2#6252)
[2/3] git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bc4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bc4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bc4f5dc
Branch: refs/heads/trunk
Commit: 7bc4f5dc327073e431e4f8aa682db76fa3367425
Parents: eb6a7b4
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 14:48:11 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 19:15:57 2014 -0700
--
.../org/apache/cassandra/tools/NodeTool.java| 70 +++-
1 file changed, 39 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bc4f5dc/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index d24e013..5120739 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -506,41 +506,49 @@ public class NodeTool
else
System.out.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-} catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
- ? Down
- : ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
- ? loadMap.get(endpoint)
- : ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-System.out.printf(format, endpoint, rack, status, state,
load, owns, token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+System.out.printf(format, endpoint, rack, status, state, load,
owns, entry.getValue());
}
System.out.println();
}
[4/4] git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bc4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bc4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bc4f5dc
Branch: refs/heads/cassandra-2.1
Commit: 7bc4f5dc327073e431e4f8aa682db76fa3367425
Parents: eb6a7b4
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 14:48:11 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 19:15:57 2014 -0700
--
.../org/apache/cassandra/tools/NodeTool.java| 70 +++-
1 file changed, 39 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bc4f5dc/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index d24e013..5120739 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -506,41 +506,49 @@ public class NodeTool
else
System.out.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-} catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
- ? Down
- : ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
- ? loadMap.get(endpoint)
- : ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-System.out.printf(format, endpoint, rack, status, state,
load, owns, token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+System.out.printf(format, endpoint, rack, status, state, load,
owns, entry.getValue());
}
System.out.println();
}
[1/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Repository: cassandra Updated Branches: refs/heads/trunk 5968f7b2e - 14c2c3bbe Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb6a7b42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb6a7b42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb6a7b42 Branch: refs/heads/trunk Commit: eb6a7b4285878a869dccd96b8cf3a893aa36a406 Parents: 5310f26 8d2c3fe Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 19:15:45 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 19:15:45 2014 -0700 -- --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d2c3fe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2c3fe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2c3fe6 Branch: refs/heads/cassandra-2.1 Commit: 8d2c3fe6737c208a889f8516eb86a8568a5916c5 Parents: 8f0952e 57f6f92 Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 14:00:17 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 14:00:17 2014 -0700 -- .../org/apache/cassandra/tools/NodeCmd.java | 71 +++- 1 file changed, 39 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2c3fe6/src/java/org/apache/cassandra/tools/NodeCmd.java --
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14c2c3bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14c2c3bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14c2c3bb Branch: refs/heads/trunk Commit: 14c2c3bbe06dccb902ad5d8cd6deffbaba6ceee7 Parents: 5968f7b 7bc4f5d Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 19:16:49 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 19:16:49 2014 -0700 -- --
[1/4] git commit: nodetool no longer shows node joining patch by driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5310f26d4 - 7bc4f5dc3
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f6f929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f6f929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f6f929
Branch: refs/heads/cassandra-2.1
Commit: 57f6f9291d5d8351dce2d493e87fdc5e62c4ebcd
Parents: 1e1129c
Author: Vijay vijay2...@gmail.com
Authored: Sun Mar 9 13:55:32 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sun Mar 9 13:55:32 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++-
1 file changed, 39 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f6f929/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java
b/src/java/org/apache/cassandra/tools/NodeCmd.java
index e14ba1a..75af915 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -328,42 +328,49 @@ public class NodeCmd
else
outs.println();
-for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+for (Map.EntryString, String entry : endpointsToTokens.entries())
{
-String endpoint = entry.getKey().getHostAddress();
-for (String token : endpointsToTokens.get(endpoint))
+String endpoint = entry.getKey();
+String rack;
+try
{
-String rack;
-try
-{
-rack =
probe.getEndpointSnitchInfoProxy().getRack(endpoint);
-}
-catch (UnknownHostException e)
-{
-rack = Unknown;
-}
+rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+}
+catch (UnknownHostException e)
+{
+rack = Unknown;
+}
-String status = liveNodes.contains(endpoint)
-? Up
-: deadNodes.contains(endpoint)
-? Down
-: ?;
-
-String state = Normal;
-
-if (joiningNodes.contains(endpoint))
-state = Joining;
-else if (leavingNodes.contains(endpoint))
-state = Leaving;
-else if (movingNodes.contains(endpoint))
-state = Moving;
-
-String load = loadMap.containsKey(endpoint)
-? loadMap.get(endpoint)
-: ?;
-String owns = new
DecimalFormat(##0.00%).format(entry.getValue());
-outs.printf(format, endpoint, rack, status, state, load, owns,
token);
+String status = liveNodes.contains(endpoint)
+? Up
+: deadNodes.contains(endpoint)
+? Down
+: ?;
+
+String state = Normal;
+
+if (joiningNodes.contains(endpoint))
+state = Joining;
+else if (leavingNodes.contains(endpoint))
+state = Leaving;
+else if (movingNodes.contains(endpoint))
+state = Moving;
+
+String load = loadMap.containsKey(endpoint)
+? loadMap.get(endpoint)
+: ?;
+String owns;
+try
+{
+InetAddress ep = InetAddress.getByName(endpoint);
+Float percent = filteredOwnerships.get(ep);
+owns = (percent != null) ? new
DecimalFormat(##0.00%).format(percent) : ?;
+}
+catch (UnknownHostException e)
+{
+throw new RuntimeException(e);
}
+outs.printf(format, endpoint, rack, status, state, load, owns,
entry.getValue());
}
outs.println();
}
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb6a7b42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb6a7b42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb6a7b42 Branch: refs/heads/cassandra-2.1 Commit: eb6a7b4285878a869dccd96b8cf3a893aa36a406 Parents: 5310f26 8d2c3fe Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 19:15:45 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 19:15:45 2014 -0700 -- --
[jira] [Commented] (CASSANDRA-6285) 2.0 HSHA server introduces corrupt data
[ https://issues.apache.org/jira/browse/CASSANDRA-6285?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13925433#comment-13925433 ] Ryan McGuire commented on CASSANDRA-6285: - I'd like to be able to reproduce this in dtests to track this bug. Seeing as [~rhatch]'s python test wasn't able to repro this issue, and a [quick test I wrote|https://github.com/riptano/cassandra-dtest/blob/cassandra-6285/test_6285.py] doesn't either, does anyone have a simple way to reproduce this issue? [~kvaster] would you mind sharing the source code for your attack jar? 2.0 HSHA server introduces corrupt data --- Key: CASSANDRA-6285 URL: https://issues.apache.org/jira/browse/CASSANDRA-6285 Project: Cassandra Issue Type: Bug Components: Core Environment: 4 nodes, shortly updated from 1.2.11 to 2.0.2 Reporter: David Sauer Assignee: Pavel Yaskevich Priority: Critical Fix For: 2.0.6 Attachments: 6285_testnotes1.txt, CASSANDRA-6285-disruptor-heap.patch, compaction_test.py After altering everything to LCS the table OpsCenter.rollups60 amd one other none OpsCenter-Table got stuck with everything hanging around in L0. The compaction started and ran until the logs showed this: ERROR [CompactionExecutor:111] 2013-11-01 19:14:53,865 CassandraDaemon.java (line 187) Exception in thread Thread[CompactionExecutor:111,1,RMI Runtime] java.lang.RuntimeException: Last written key DecoratedKey(1326283851463420237, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574426c6f6f6d46696c746572537061636555736564) = current key DecoratedKey(954210699457429663, 37382e34362e3132382e3139382d6a7576616c69735f6e6f72785f696e6465785f323031335f31305f30382d63616368655f646f63756d656e74736c6f6f6b75702d676574546f74616c4469736b5370616365557365640b0f) writing into /var/lib/cassandra/data/OpsCenter/rollups60/OpsCenter-rollups60-tmp-jb-58656-Data.db at org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:141) at org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:164) at org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:160) at org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60) at org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59) at org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296) at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Moving back to STC worked to keep the compactions running. Especialy my own Table i would like to move to LCS. After a major compaction with STC the move to LCS fails with the same Exception. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Assigned] (CASSANDRA-6773) Delimiter not working for special characters in COPY command from CQLSH
[
https://issues.apache.org/jira/browse/CASSANDRA-6773?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Shiti Saxena reassigned CASSANDRA-6773:
---
Assignee: Shiti Saxena
Delimiter not working for special characters in COPY command from CQLSH
---
Key: CASSANDRA-6773
URL: https://issues.apache.org/jira/browse/CASSANDRA-6773
Project: Cassandra
Issue Type: Bug
Reporter: Shiti Saxena
Assignee: Shiti Saxena
Priority: Trivial
Labels: CQL, CQL3
Attachments: trunk-6773.txt
COPY command from CQLSH which can be used to load data from CSV files is not
working with option delimiter='\t'
cqlshCREATE TABLE airplanes (
name text PRIMARY KEY,
manufacturer ascii,
year int,
mach float
);
cqlshINSERT INTO airplanes (name, manufacturer, year, mach) VALUES
('P38-Lightning', 'Lockheed', 1937, 7);
cqlsh SELECT * FROM airplanes;
name | mach | manufacturer | year
--+--+--+--
P38-Lightning | 0.7 | Lockheed | 1937
cqlsh COPY airplanes (name, manufacturer, year, mach) TO 'temp.tsv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
cqlsh COPY airplanes (name, manufacturer, year, mach) FROM 'temp.csv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-6773) Delimiter not working for special characters in COPY command from CQLSH
[
https://issues.apache.org/jira/browse/CASSANDRA-6773?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Shiti Saxena updated CASSANDRA-6773:
Attachment: (was: trunk-6773.txt)
Delimiter not working for special characters in COPY command from CQLSH
---
Key: CASSANDRA-6773
URL: https://issues.apache.org/jira/browse/CASSANDRA-6773
Project: Cassandra
Issue Type: Bug
Reporter: Shiti Saxena
Assignee: Shiti Saxena
Priority: Trivial
Labels: CQL, CQL3
COPY command from CQLSH which can be used to load data from CSV files is not
working with option delimiter='\t'
cqlshCREATE TABLE airplanes (
name text PRIMARY KEY,
manufacturer ascii,
year int,
mach float
);
cqlshINSERT INTO airplanes (name, manufacturer, year, mach) VALUES
('P38-Lightning', 'Lockheed', 1937, 7);
cqlsh SELECT * FROM airplanes;
name | mach | manufacturer | year
--+--+--+--
P38-Lightning | 0.7 | Lockheed | 1937
cqlsh COPY airplanes (name, manufacturer, year, mach) TO 'temp.tsv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
cqlsh COPY airplanes (name, manufacturer, year, mach) FROM 'temp.csv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Updated] (CASSANDRA-6773) Delimiter not working for special characters in COPY command from CQLSH
[
https://issues.apache.org/jira/browse/CASSANDRA-6773?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Shiti Saxena updated CASSANDRA-6773:
Attachment: trunk-6773.txt
Delimiter not working for special characters in COPY command from CQLSH
---
Key: CASSANDRA-6773
URL: https://issues.apache.org/jira/browse/CASSANDRA-6773
Project: Cassandra
Issue Type: Bug
Reporter: Shiti Saxena
Assignee: Shiti Saxena
Priority: Trivial
Labels: CQL, CQL3
Attachments: trunk-6773.txt
COPY command from CQLSH which can be used to load data from CSV files is not
working with option delimiter='\t'
cqlshCREATE TABLE airplanes (
name text PRIMARY KEY,
manufacturer ascii,
year int,
mach float
);
cqlshINSERT INTO airplanes (name, manufacturer, year, mach) VALUES
('P38-Lightning', 'Lockheed', 1937, 7);
cqlsh SELECT * FROM airplanes;
name | mach | manufacturer | year
--+--+--+--
P38-Lightning | 0.7 | Lockheed | 1937
cqlsh COPY airplanes (name, manufacturer, year, mach) TO 'temp.tsv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
cqlsh COPY airplanes (name, manufacturer, year, mach) FROM 'temp.csv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-6773) Delimiter not working for special characters in COPY command from CQLSH
[
https://issues.apache.org/jira/browse/CASSANDRA-6773?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13925456#comment-13925456
]
Shiti Saxena commented on CASSANDRA-6773:
-
Hi [~mishail],
I assumed that one would use double \ when they had to specify backslash as a
value since its escape character.
{code}
cqlsh:test COPY ttable TO 'test.csv' WITH ESCAPE = '\\';
{code}
Is this wrong? Should we handle cases where user sets the value using a single
\ or throw an error?
If this should be handled internally, are there any other cases we need to
handle?
Delimiter not working for special characters in COPY command from CQLSH
---
Key: CASSANDRA-6773
URL: https://issues.apache.org/jira/browse/CASSANDRA-6773
Project: Cassandra
Issue Type: Bug
Reporter: Shiti Saxena
Assignee: Shiti Saxena
Priority: Trivial
Labels: CQL, CQL3
Attachments: trunk-6773.txt
COPY command from CQLSH which can be used to load data from CSV files is not
working with option delimiter='\t'
cqlshCREATE TABLE airplanes (
name text PRIMARY KEY,
manufacturer ascii,
year int,
mach float
);
cqlshINSERT INTO airplanes (name, manufacturer, year, mach) VALUES
('P38-Lightning', 'Lockheed', 1937, 7);
cqlsh SELECT * FROM airplanes;
name | mach | manufacturer | year
--+--+--+--
P38-Lightning | 0.7 | Lockheed | 1937
cqlsh COPY airplanes (name, manufacturer, year, mach) TO 'temp.tsv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
cqlsh COPY airplanes (name, manufacturer, year, mach) FROM 'temp.csv' WITH
DELIMITER = '\t';
delimiter must be an 1-character string
--
This message was sent by Atlassian JIRA
(v6.2#6252)
