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/02 22:04:02 UTC
[01/16] cassandra git commit: Only log yaml config once, at startup
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 d1f6a1d95 -> 093454205
refs/heads/cassandra-3.0 3c8a09767 -> 621f446ca
refs/heads/cassandra-3.5 87992c3a4 -> 965ee082d
refs/heads/trunk 87992c3a4 -> 2d420e6c2
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09345420
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09345420
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09345420
Branch: refs/heads/cassandra-2.2
Commit: 093454205498bad7094cb8fb362d60e95296b092
Parents: d1f6a1d
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:57:06 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 51 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 +------
4 files changed, 63 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 481916b..db6d79d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index e7ac0c0..c7ad837 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,14 +17,27 @@
*/
package org.apache.cassandra.config;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -38,6 +51,8 @@ import org.supercsv.prefs.CsvPreference;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -368,4 +383,40 @@ public class Config
{
keyspace
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/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 af0595d..cbea2ff 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 8331f85..dc691c4 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -89,7 +89,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
{
try
{
- logger.info("Loading settings from {}", url);
+ logger.debug("Loading settings from {}", url);
byte[] configBytes;
try (InputStream is = url.openStream())
{
@@ -101,8 +101,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
@@ -121,20 +119,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[11/16] 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/cd6f57ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd6f57ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd6f57ec
Branch: refs/heads/trunk
Commit: cd6f57ec07ff046ab599df1707eb7b952c139c23
Parents: 87992c3 621f446
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 13:00:41 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:00:41 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/621f446c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/621f446c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/621f446c
Branch: refs/heads/cassandra-3.5
Commit: 621f446ca4a319adcb50d2479e3fa7121eac6ebd
Parents: 49a33e4
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:59:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b77d811..819fa22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,7 @@
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* 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/621f446c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index ca5bcea..32c0bfa 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -383,4 +395,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/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 c903775..7bcfb97 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[04/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09345420
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09345420
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09345420
Branch: refs/heads/trunk
Commit: 093454205498bad7094cb8fb362d60e95296b092
Parents: d1f6a1d
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:57:06 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 51 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 +------
4 files changed, 63 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 481916b..db6d79d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index e7ac0c0..c7ad837 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,14 +17,27 @@
*/
package org.apache.cassandra.config;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -38,6 +51,8 @@ import org.supercsv.prefs.CsvPreference;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -368,4 +383,40 @@ public class Config
{
keyspace
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/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 af0595d..cbea2ff 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 8331f85..dc691c4 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -89,7 +89,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
{
try
{
- logger.info("Loading settings from {}", url);
+ logger.debug("Loading settings from {}", url);
byte[] configBytes;
try (InputStream is = url.openStream())
{
@@ -101,8 +101,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
@@ -121,20 +119,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[15/16] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9991db24
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9991db24
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9991db24
Branch: refs/heads/trunk
Commit: 9991db24bc0f9c0a3160687da635119a89e601a3
Parents: 87992c3 965ee08
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 13:02:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:02:27 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09345420
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09345420
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09345420
Branch: refs/heads/cassandra-3.5
Commit: 093454205498bad7094cb8fb362d60e95296b092
Parents: d1f6a1d
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:57:06 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 51 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 +------
4 files changed, 63 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 481916b..db6d79d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index e7ac0c0..c7ad837 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,14 +17,27 @@
*/
package org.apache.cassandra.config;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -38,6 +51,8 @@ import org.supercsv.prefs.CsvPreference;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -368,4 +383,40 @@ public class Config
{
keyspace
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/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 af0595d..cbea2ff 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 8331f85..dc691c4 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -89,7 +89,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
{
try
{
- logger.info("Loading settings from {}", url);
+ logger.debug("Loading settings from {}", url);
byte[] configBytes;
try (InputStream is = url.openStream())
{
@@ -101,8 +101,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
@@ -121,20 +119,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[07/16] 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/49a33e49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a33e49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49a33e49
Branch: refs/heads/cassandra-3.5
Commit: 49a33e49c362f1ebdbf214320842a6f3a5ac16b0
Parents: 3c8a097 0934542
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 12:58:16 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:58:16 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d420e6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d420e6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d420e6c
Branch: refs/heads/trunk
Commit: 2d420e6c2a362c69d1a66076ac7dd2db37ee9306
Parents: 9991db2
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:03:09 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 11 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d420e6c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a4b1aab..729d491 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d420e6c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index c783960..fea1b04 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -387,4 +399,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d420e6c/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 a3a9b4a..7057c37 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -103,6 +103,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
private static EncryptionContext encryptionContext;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -134,7 +135,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d420e6c/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[09/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/621f446c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/621f446c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/621f446c
Branch: refs/heads/trunk
Commit: 621f446ca4a319adcb50d2479e3fa7121eac6ebd
Parents: 49a33e4
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:59:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b77d811..819fa22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,7 @@
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* 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/621f446c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index ca5bcea..32c0bfa 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -383,4 +395,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/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 c903775..7bcfb97 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[02/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09345420
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09345420
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09345420
Branch: refs/heads/cassandra-3.0
Commit: 093454205498bad7094cb8fb362d60e95296b092
Parents: d1f6a1d
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:57:06 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 51 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 +------
4 files changed, 63 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 481916b..db6d79d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index e7ac0c0..c7ad837 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,14 +17,27 @@
*/
package org.apache.cassandra.config;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -38,6 +51,8 @@ import org.supercsv.prefs.CsvPreference;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -368,4 +383,40 @@ public class Config
{
keyspace
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/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 af0595d..cbea2ff 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09345420/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 8331f85..dc691c4 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -89,7 +89,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
{
try
{
- logger.info("Loading settings from {}", url);
+ logger.debug("Loading settings from {}", url);
byte[] configBytes;
try (InputStream is = url.openStream())
{
@@ -101,8 +101,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
TypeDescription seedDesc = new TypeDescription(ParameterizedClass.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
@@ -121,20 +119,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[12/16] 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/cd6f57ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd6f57ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd6f57ec
Branch: refs/heads/cassandra-3.5
Commit: cd6f57ec07ff046ab599df1707eb7b952c139c23
Parents: 87992c3 621f446
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 13:00:41 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:00:41 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/965ee082
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/965ee082
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/965ee082
Branch: refs/heads/cassandra-3.5
Commit: 965ee082da2b8a3ff5e932e91d261018d9232c75
Parents: cd6f57e
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:01:47 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 11 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a4b1aab..729d491 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index c783960..fea1b04 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -387,4 +399,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/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 a3a9b4a..7057c37 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -103,6 +103,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
private static EncryptionContext encryptionContext;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -134,7 +135,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[10/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/621f446c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/621f446c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/621f446c
Branch: refs/heads/cassandra-3.0
Commit: 621f446ca4a319adcb50d2479e3fa7121eac6ebd
Parents: 49a33e4
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:59:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 12 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b77d811..819fa22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,7 @@
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* 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/621f446c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index ca5bcea..32c0bfa 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -383,4 +395,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/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 c903775..7bcfb97 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -53,7 +53,6 @@ import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.thrift.ThriftServer;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.memory.*;
@@ -101,6 +100,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -132,7 +132,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/621f446c/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[13/16] cassandra git commit: Only log yaml config once, at startup
Posted by ja...@apache.org.
Only log yaml config once, at startup
patch by jasobrown, reviewed by Paulo Motta for CASSANDRA-11217
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/965ee082
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/965ee082
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/965ee082
Branch: refs/heads/trunk
Commit: 965ee082da2b8a3ff5e932e91d261018d9232c75
Parents: cd6f57e
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Feb 12 14:55:27 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 13:01:47 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/config/Config.java | 48 ++++++++++++++++++++
.../cassandra/config/DatabaseDescriptor.java | 11 ++++-
.../config/YamlConfigurationLoader.java | 18 --------
4 files changed, 59 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a4b1aab..729d491 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,7 @@ Merged from 3.0:
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Only log yaml config once, at startup (CASSANDRA-11217)
* Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
* Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index c783960..fea1b04 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -17,11 +17,21 @@
*/
package org.apache.cassandra.config;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
@@ -32,6 +42,8 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
*/
public class Config
{
+ private static final Logger logger = LoggerFactory.getLogger(Config.class);
+
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -387,4 +399,40 @@ public class Config
ssd,
spinning
}
+
+ private static final List<String> SENSITIVE_KEYS = new ArrayList<String>() {{
+ add("client_encryption_options");
+ add("server_encryption_options");
+ }};
+ public void log()
+ {
+ Map<String, String> configMap = new TreeMap<>();
+ for (Field field : getClass().getFields())
+ {
+ // ignore the constants
+ if (Modifier.isFinal(field.getModifiers()))
+ continue;
+
+ String name = field.getName();
+ if (SENSITIVE_KEYS.contains(name))
+ {
+ configMap.put(name, "<REDACTED>");
+ continue;
+ }
+
+ String value;
+ try
+ {
+ // Field.get() can throw NPE if the value of the field is null
+ value = field.get(this).toString();
+ }
+ catch (NullPointerException | IllegalAccessException npe)
+ {
+ value = "null";
+ }
+ configMap.put(name, value);
+ }
+
+ logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]");
+ }
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/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 a3a9b4a..7057c37 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -103,6 +103,7 @@ public class DatabaseDescriptor
private static String localDC;
private static Comparator<InetAddress> localComparator;
private static EncryptionContext encryptionContext;
+ private static boolean hasLoggedConfig;
public static void forceStaticInitialization() {}
static
@@ -134,7 +135,15 @@ public class DatabaseDescriptor
ConfigurationLoader loader = loaderClass == null
? new YamlConfigurationLoader()
: FBUtilities.<ConfigurationLoader>construct(loaderClass, "configuration loading");
- return loader.loadConfig();
+ Config config = loader.loadConfig();
+
+ if (!hasLoggedConfig)
+ {
+ hasLoggedConfig = true;
+ config.log();
+ }
+
+ return config;
}
private static InetAddress getNetworkInterfaceAddress(String intf, String configName, boolean preferIPv6) throws ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/965ee082/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index 917eaeb..435377c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -27,9 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -113,8 +111,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
throw new AssertionError(e);
}
- logConfig(configBytes);
-
Constructor constructor = new CustomConstructor(Config.class);
MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
@@ -165,20 +161,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
}
}
- private void logConfig(byte[] configBytes)
- {
- Map<Object, Object> configMap = new TreeMap<>((Map<?, ?>) new Yaml().load(new ByteArrayInputStream(configBytes)));
- // these keys contain passwords, don't log them
- for (String sensitiveKey : new String[] { "client_encryption_options", "server_encryption_options" })
- {
- if (configMap.containsKey(sensitiveKey))
- {
- configMap.put(sensitiveKey, "<REDACTED>");
- }
- }
- logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet()));
- }
-
private static class MissingPropertiesChecker extends PropertyUtils
{
private final Set<String> missingProperties = new HashSet<>();
[06/16] 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/49a33e49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a33e49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49a33e49
Branch: refs/heads/trunk
Commit: 49a33e49c362f1ebdbf214320842a6f3a5ac16b0
Parents: 3c8a097 0934542
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 12:58:16 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:58:16 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/16] 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/49a33e49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a33e49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49a33e49
Branch: refs/heads/cassandra-3.0
Commit: 49a33e49c362f1ebdbf214320842a6f3a5ac16b0
Parents: 3c8a097 0934542
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Mar 2 12:58:16 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Mar 2 12:58:16 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------