Merge branch 'cassandra-3.11' into trunk

Jaumo · Feb 11, 2017 · 61b3d34 · 61b3d34
2 parents cd33e0f + 3ae5a4d
commit 61b3d34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -37,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)

diff --git a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java
@@ -213,7 +213,8 @@ else if (mode == ReadingMode.NEXTITERATION)
                         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);