This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-2.2 in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push: new f293376 TLS connections to the storage port on a node without server encryption configured causes java.io.IOException accessing missing keystore f293376 is described below commit f293376aa8dd315a208ef2f03bdcb7a84dcc675c Author: Jon Meredith <jmeredit...@apple.com> AuthorDate: Thu Nov 5 12:58:07 2020 -0800 TLS connections to the storage port on a node without server encryption configured causes java.io.IOException accessing missing keystore patch by Jon Meredith; reviewed by David Capwell, Dinesh Joshi for CASSANDRA-16144 --- .../cassandra/config/YamlConfigurationLoader.java | 4 +++- .../cassandra/distributed/impl/InstanceConfig.java | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 07b149c..2ca978f 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -143,7 +143,9 @@ public class YamlConfigurationLoader implements ConfigurationLoader return node; } }); - return (T) constructor.getSingleData(klass); + T value = (T) constructor.getSingleData(klass); + propertiesChecker.check(); + return value; } static class CustomConstructor extends CustomClassLoaderConstructor diff --git a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java index 861e2ea..b71f22c 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java @@ -57,6 +57,7 @@ public class InstanceConfig implements IInstanceConfig public final UUID hostId; public UUID hostId() { return hostId; } private final Map<String, Object> params = new TreeMap<>(); + private final Map<String, Object> dtestParams = new TreeMap<>(); private final EnumSet featureFlags; @@ -119,6 +120,7 @@ public class InstanceConfig implements IInstanceConfig this.num = copy.num; this.networkTopology = new NetworkTopology(copy.networkTopology); this.params.putAll(copy.params); + this.dtestParams.putAll(copy.dtestParams); this.hostId = copy.hostId; this.featureFlags = copy.featureFlags; this.broadcastAddressAndPort = copy.broadcastAddressAndPort; @@ -185,7 +187,7 @@ public class InstanceConfig implements IInstanceConfig if (value == null) value = NULL; - params.put(fieldName, value); + getParams(fieldName).put(fieldName, value); return this; } @@ -195,10 +197,18 @@ public class InstanceConfig implements IInstanceConfig value = NULL; // test value - params.put(fieldName, value); + getParams(fieldName).put(fieldName, value); return this; } + private Map<String, Object> getParams(String fieldName) + { + Map<String, Object> map = params; + if (fieldName.startsWith("dtest")) + map = dtestParams; + return map; + } + public void propagate(Object writeToConfig, Map<Class<?>, Function<Object, Object>> mapping) { throw new IllegalStateException("In-JVM dtests no longer support propagate"); @@ -212,17 +222,17 @@ public class InstanceConfig implements IInstanceConfig public Object get(String name) { - return params.get(name); + return getParams(name).get(name); } public int getInt(String name) { - return (Integer)params.get(name); + return (Integer) get(name); } public String getString(String name) { - return (String)params.get(name); + return (String) get(name); } public Map<String, Object> getParams() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org