You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/02/11 05:28:15 UTC
[1/3] cassandra git commit: Obfuscate password in stress-graphs
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 e58c26a29 -> 3ae5a4d67
refs/heads/trunk cd33e0fda -> 61b3d3490
Obfuscate password in stress-graphs
Patch by Christopher Batey; Reviewed by Jeff Jirsa for CASSANDRA-12233
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ae5a4d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ae5a4d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ae5a4d6
Branch: refs/heads/cassandra-3.11
Commit: 3ae5a4d679aa52c890221be19b1401c77a5aa109
Parents: e58c26a
Author: Christopher Batey <ch...@gmail.com>
Authored: Wed Jul 20 15:36:24 2016 +0100
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Fri Feb 10 21:22:47 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
tools/stress/src/org/apache/cassandra/stress/StressGraph.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ae5a4d6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df91d43..a69cbe3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
* Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
* nodetool stopdaemon errors out (CASSANDRA-13030)
* Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ae5a4d6/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
index 17b718d..663bde6 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
@@ -213,7 +213,8 @@ public class StressGraph
json.put("revision", stressSettings.graph.revision);
else
json.put("revision", String.format("%s - %s threads", stressSettings.graph.revision, currentThreadCount));
- json.put("command", StringUtils.join(stressArguments, " "));
+ String command = StringUtils.join(stressArguments, " ").replaceAll("password=.*? ", "password=******* ");
+ json.put("command", command);
json.put("intervals", intervals);
stats.add(json);
[2/3] cassandra git commit: Obfuscate password in stress-graphs
Posted by jj...@apache.org.
Obfuscate password in stress-graphs
Patch by Christopher Batey; Reviewed by Jeff Jirsa for CASSANDRA-12233
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ae5a4d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ae5a4d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ae5a4d6
Branch: refs/heads/trunk
Commit: 3ae5a4d679aa52c890221be19b1401c77a5aa109
Parents: e58c26a
Author: Christopher Batey <ch...@gmail.com>
Authored: Wed Jul 20 15:36:24 2016 +0100
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Fri Feb 10 21:22:47 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
tools/stress/src/org/apache/cassandra/stress/StressGraph.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ae5a4d6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df91d43..a69cbe3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
* Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
* nodetool stopdaemon errors out (CASSANDRA-13030)
* Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ae5a4d6/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
index 17b718d..663bde6 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
@@ -213,7 +213,8 @@ public class StressGraph
json.put("revision", stressSettings.graph.revision);
else
json.put("revision", String.format("%s - %s threads", stressSettings.graph.revision, currentThreadCount));
- json.put("command", StringUtils.join(stressArguments, " "));
+ String command = StringUtils.join(stressArguments, " ").replaceAll("password=.*? ", "password=******* ");
+ json.put("command", command);
json.put("intervals", intervals);
stats.add(json);
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jj...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61b3d349
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61b3d349
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61b3d349
Branch: refs/heads/trunk
Commit: 61b3d3490a3620383587a3693c681c58d4559e1f
Parents: cd33e0f 3ae5a4d
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Fri Feb 10 21:23:15 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Fri Feb 10 21:23:41 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
tools/stress/src/org/apache/cassandra/stress/StressGraph.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61b3d349/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b7c7cb8,a69cbe3..d2023cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,6 -7,6 +37,7 @@@
* More fixes to the TokenAllocator (CASSANDRA-12990)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
Merged from 3.0:
++ * Obfuscate password in stress-graphs (CASSANDRA-12233)
* Hint related logging should include the IP address of the destination in addition to
host ID (CASSANDRA-13205)
* Reloading logback.xml does not work (CASSANDRA-13173)