Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/1030#discussion_r50302126
--- Diff: storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java ---
@@ -0,0 +1,711 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.storm.utils;
+
+import org.apache.storm.Config;
+import org.apache.storm.validation.ConfigValidation;
+import org.apache.storm.generated.StormTopology;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+
+public class ConfigUtils {
+ private final static Logger LOG =
LoggerFactory.getLogger(ConfigUtils.class);
+ public final static String RESOURCES_SUBDIR = "resources";
+ public final static String NIMBUS_DO_NOT_REASSIGN =
"NIMBUS-DO-NOT-REASSIGN";
+ public static final String FILE_SEPARATOR = File.separator;
+ public final static String LOG_DIR;
+
+ static {
+ String dir;
+ Map conf;
+ if (System.getProperty("storm.log.dir") != null) {
+ dir = System.getProperty("storm.log.dir");
+ } else if ((conf = readStormConfig()).get("storm.log.dir") !=
null) {
+ dir = String.valueOf(conf.get("storm.log.dir"));
+ } else {
+ if (System.getProperty("storm.home") != null) {
+ dir = System.getProperty("storm.home") + FILE_SEPARATOR +
"logs";
+ } else {
+ dir = FILE_SEPARATOR + "logs";
+ }
+ }
+ try {
+ LOG_DIR = new File(dir).getCanonicalPath();
+ } catch (IOException ex) {
+ throw new IllegalArgumentException("Illegal storm.log.dir in
conf: " + dir);
+ }
+ }
+
+ public static String clojureConfigName(String name) {
+ return name.toUpperCase().replace("_", "-");
+ }
+
+ // ALL-CONFIGS is only used by executor.clj once, do we want to do it
here? TODO
+ public static List<Object> All_CONFIGS() {
+ List<Object> ret = new ArrayList<Object>();
+ Config config = new Config();
+ Class<?> ConfigClass = config.getClass();
+ Field[] fields = ConfigClass.getFields();
+ for (int i = 0; i < fields.length; i++) {
+ try {
+ Object obj = fields[i].get(null);
+ ret.add(obj);
+ } catch (IllegalArgumentException e) {
+ LOG.error(e.getMessage(), e);
+ } catch (IllegalAccessException e) {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+ return ret;
+ }
+
+ public static String clusterMode(Map conf) {
+ String mode = (String) conf.get(Config.STORM_CLUSTER_MODE);
+ return mode;
+
+ }
+
+ public static boolean isLocalMode(Map conf) {
+ String mode = (String) conf.get(Config.STORM_CLUSTER_MODE);
+ if (mode != null) {
+ if ("local".equals(mode)) {
+ return true;
+ }
+ if ("distributed".equals(mode)) {
+ return false;
+ }
+ }
+ throw new IllegalArgumentException("Illegal cluster mode in conf:
" + mode);
+ }
+
+ public static int samplingRate(Map conf) {
+ double rate =
Utils.getDouble(conf.get(Config.TOPOLOGY_STATS_SAMPLE_RATE));
+ if (rate != 0) {
+ return (int) (1 / rate);
+ }
+ throw new IllegalArgumentException("Illegal
topology.stats.sample.rate in conf: " + rate);
+ }
+
+ // public static mkStatsSampler // depends on Utils.evenSampler()
TODO, this is sth we need to do after util
+ // public static readDefaultConfig // depends on
Utils.clojurifyStructure and Utils.readDefaultConfig // TODO
+ // validate-configs-with-schemas is just a wrapper of
ConfigValidation.validateFields(conf)
+
+ //For testing only
+ // for java
+ // try (SetMockedStormConfig mocked = new SetMockedStormConfig(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedStormConfig. conf)]
+ // run test ...)
+ public static class SetMockedStormConfig implements Closeable {
+ public SetMockedStormConfig(Map conf) {
+ mockedStormConfig = conf;
+ }
+
+ @Override
+ public void close() {
+ mockedStormConfig = null;
+ }
+ }
+ private static Map mockedStormConfig = null;
+ public static Map readStormConfig() {
+ if (mockedStormConfig != null) return mockedStormConfig;
+ Map conf = Utils.readStormConfig();
+ ConfigValidation.validateFields(conf);
+ return conf;
+ }
+
+ public static Map readYamlConfig(String name, boolean mustExist) {
+ Map conf = Utils.findAndReadConfigFile(name, mustExist);
+ ConfigValidation.validateFields(conf);
+ return conf;
+ }
+
+ public static Map readYamlConfig(String name) {
+ return readYamlConfig(name, true);
+ }
+
+ public static String absoluteStormLocalDir(Map conf) {
+ String stormHome = System.getProperty("storm.home");
+ String localDir = (String) conf.get(Config.STORM_LOCAL_DIR);
+ if (localDir == null) {
+ return (stormHome + FILE_SEPARATOR + "storm-local");
+ } else {
+ if (new File(localDir).isAbsolute()) {
+ return localDir;
+ } else {
+ return (stormHome + FILE_SEPARATOR + localDir);
+ }
+ }
+
+ }
+
+ public static String absoluteHealthCheckDir(Map conf) {
+ String stormHome = System.getProperty("storm.home");
+ String healthCheckDir =
String.valueOf(conf.get(Config.STORM_HEALTH_CHECK_DIR));
+ if (healthCheckDir.equals("null")) {
+ return (stormHome + FILE_SEPARATOR + "healthchecks");
+ } else {
+ if (new File(healthCheckDir).isAbsolute()) {
+ return healthCheckDir;
+ } else {
+ return (stormHome + FILE_SEPARATOR + healthCheckDir);
+ }
+ }
+ }
+
+ public static String masterLocalDir(Map conf) throws IOException {
+ String ret = String.valueOf(conf.get(Config.STORM_LOCAL_DIR)) +
FILE_SEPARATOR + "nimbus";
+ try {
+ FileUtils.forceMkdir(new File(ret));
+ } catch (IOException e) {
+ LOG.error("Failed to create dir " + ret, e);
+ throw e;
+ }
+ return ret;
+ }
+
+
+ public static String masterStormJarKey(String topologyId) {
+ return (topologyId + "-stormjar.jar");
+ }
+
+ public static String masterStormCodeKey(String topologyId) {
+ return (topologyId + "-stormcode.ser");
+ }
+
+ public static String masterStormConfKey(String topologyId) {
+ return (topologyId + "-stormconf.ser");
+ }
+
+ public static String masterStormDistRoot(Map conf) throws IOException {
+ String ret = stormDistPath(masterLocalDir(conf));
+ FileUtils.forceMkdir(new File(ret));
+ return ret;
+ }
+
+ public static String masterStormDistRoot(Map conf, String stormId)
throws IOException {
+ return (masterStormDistRoot(conf) + FILE_SEPARATOR + stormId);
+ }
+
+ public static String stormDistPath(String stormRoot) {
+ String ret = "";
+ // we do this since to concat a null String will actually concat a
"null", which is not the expected: ""
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return ret + FILE_SEPARATOR + "stormdist";
+ }
+
+ public static String stormTmpPath(String stormRoot) {
+ return stormRoot + FILE_SEPARATOR + "tmp";
+ }
+
+ /* Never get used TODO : delete it*/
+ public static String masterTmpDir(Map conf) throws IOException {
+ String ret = stormTmpPath(masterLocalDir(conf));
+ FileUtils.forceMkdir(new File(ret));
+ return ret;
+ }
+
+ public static Map readSupervisorStormConfGivenPath(Map conf, String
stormConfPath) throws IOException {
+ Map ret = new HashMap(conf);
+
ret.putAll(Utils.fromCompressedJsonConf(FileUtils.readFileToByteArray(new
File(stormConfPath))));
+ return ret;
+ }
+
+ /* Never get used TODO : may delete it*/
+ public static String masterStormMetaFilePath(String stormRoot) {
+ return (stormRoot + FILE_SEPARATOR +
"storm-code-distributor.meta");
+ }
+
+ public static String masterStormJarPath(String stormRoot) {
+ return (stormRoot + FILE_SEPARATOR + "stormjar.jar");
+ }
+
+ /* Never get used TODO : may delete it*/
+ public static String masterStormCodePath(String stormRoot) {
+ return (stormRoot + FILE_SEPARATOR + "stormcode.ser");
+ }
+
+ /* Never get used TODO : may delete it*/
+ public static String masterStormConfPath(String stormRoot) {
+ return (stormRoot + FILE_SEPARATOR + "stormconf.ser");
+ }
+
+ public static String masterInbox(Map conf) throws IOException {
+ String ret = masterLocalDir(conf) + FILE_SEPARATOR + "inbox";
+ try {
+ FileUtils.forceMkdir(new File(ret));
+ } catch (IOException e) {
+ LOG.error("Failed to create dir " + ret, e);
+ throw e;
+ }
+ return ret;
+ }
+
+ public static String masterInimbusDir(Map conf) throws IOException {
+ return (masterLocalDir(conf) + FILE_SEPARATOR + "inimbus");
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedSupervisorLocalDir mocked = new
SetMockedSupervisorLocalDir(dir)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedSupervisorLocalDir. dir)]
+ // run test ...)
+ public static class SetMockedSupervisorLocalDir implements Closeable {
+ public SetMockedSupervisorLocalDir(String dir) {
+ mockedSupervisorLocalDir = dir;
+ }
+ @Override
+ public void close() {
+ mockedSupervisorLocalDir = null;
+ }
+ }
+ private static String mockedSupervisorLocalDir = null;
+ public static String supervisorLocalDir(Map conf) throws IOException {
+ if (mockedSupervisorLocalDir != null) {
+ return null;
+ }
+ String ret = absoluteStormLocalDir(conf) + FILE_SEPARATOR +
"supervisor";
+ FileUtils.forceMkdir(new File(ret));
+ return ret;
+ }
+
+ public static String supervisorIsupervisorDir(Map conf) throws
IOException {
+ return ((supervisorLocalDir(conf) + FILE_SEPARATOR +
"isupervisor"));
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedSupervisorStormDistRoot mocked = new
SetMockedSupervisorStormDistRoot(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedSupervisorStormDistRoot. conf)]
+ // run test ...)
+ public static class SetMockedSupervisorStormDistRoot implements
Closeable {
+ public SetMockedSupervisorStormDistRoot(Map conf) {
+ mockedSupervisorStormDistRoot = conf;
+ }
+ @Override
+ public void close() {
+ mockedSupervisorStormDistRoot = null;
+ }
+ }
+ private static Map mockedSupervisorStormDistRoot = null;
+ public static String supervisorStormDistRoot(Map conf) throws
IOException {
+ if (mockedSupervisorStormDistRoot != null) {
+ return null;
+ }
+ return stormDistPath(supervisorLocalDir(conf)); // TODO: no need
to forceMake here?, clj does not.
+ }
+
+ public static String supervisorStormDistRoot(Map conf, String stormId)
throws IOException {
+ if (mockedSupervisorStormDistRoot != null) {
+ return null;
+ }
+ return supervisorStormDistRoot(conf) + FILE_SEPARATOR + stormId;
// TODO: need to (url-encode storm-id)? Not.
+ }
+
+ public static String supervisorStormJarPath(String stormRoot) {
+ String ret = "";
+ // we do this since to concat a null String will actually concat a
"null", which is not the expected: ""
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return (ret + FILE_SEPARATOR + "stormjar.jar");
+ }
+
+ /* Never get used TODO : may delete it*/
+ public static String supervisorStormMetaFilePath(String stormRoot) {
+ String ret = "";
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return (ret + FILE_SEPARATOR + "storm-code-distributor.meta");
+ }
+
+ public static String supervisorStormCodePath(String stormRoot) {
+ String ret = "";
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return (ret + FILE_SEPARATOR + "stormcode.ser");
+ }
+
+ public static String supervisorStormConfPath(String stormRoot) {
+ String ret = "";
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return (ret + FILE_SEPARATOR + "stormconf.ser");
+ }
+
+ public static String supervisorTmpDir(Map conf) throws IOException {
+ String ret = supervisorLocalDir(conf) + FILE_SEPARATOR + "tmp";
+ FileUtils.forceMkdir(new File(ret));
+ return ret;
+ }
+
+ public static String supervisorStormResourcesPath(String stormRoot) {
+ String ret = "";
+ // we do this since to concat a null String will actually concat a
"null", which is not the expected: ""
+ if (stormRoot != null) {
+ ret = stormRoot;
+ }
+ return (ret + FILE_SEPARATOR + RESOURCES_SUBDIR);
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedSupervisorState mocked = new
SetMockedSupervisorState(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedSupervisorState. conf)]
+ // run test ...)
+ public static class SetMockedSupervisorState implements Closeable {
+ public SetMockedSupervisorState(Map conf) {
+ mockedSupervisorState = conf;
+ }
+ @Override
+ public void close() {
+ mockedSupervisorState = null;
+ }
+ }
+ private static Map mockedSupervisorState = null;
+ public static LocalState supervisorState(Map conf) throws IOException {
+ if (mockedSupervisorState != null) {
+ return null;
+ }
+ return new LocalState((supervisorLocalDir(conf) + FILE_SEPARATOR +
"localstate"));
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedNimbusTopoHistoryState mocked = new
SetMockedNimbusTopoHistoryState(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedNimbusTopoHistoryState. conf)]
+ // run test ...)
+ public static class SetMockedNimbusTopoHistoryState implements
Closeable {
+ public SetMockedNimbusTopoHistoryState(Map conf) {
+ mockedNimbusTopoHistoryState = conf;
+ }
+ @Override
+ public void close() {
+ mockedNimbusTopoHistoryState = null;
+ }
+ }
+ private static Map mockedNimbusTopoHistoryState = null;
+ public static LocalState nimbusTopoHistoryState(Map conf) throws
IOException {
+ if (mockedNimbusTopoHistoryState != null) {
+ return null;
+ }
+ return new LocalState((masterLocalDir(conf) + FILE_SEPARATOR +
"history"));
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedSupervisorStormConf mocked = new
SetMockedSupervisorStormConf(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedSupervisorStormConf. conf)]
+ // run test ...)
+ public static class SetMockedSupervisorStormConf implements Closeable {
+ public SetMockedSupervisorStormConf(Map conf) {
+ mockedSupervisorStormConf = conf;
+ }
+
+ @Override
+ public void close() {
+ mockedSupervisorStormConf = null;
+ }
+ }
+ private static Map mockedSupervisorStormConf = null;
+ public static Map readSupervisorStormConf(Map conf, String stormId)
throws IOException {
+ if (mockedSupervisorStormConf != null) {
+ return mockedSupervisorStormConf;
+ }
+ String stormRoot = supervisorStormDistRoot(conf, stormId);
+ String confPath = supervisorStormConfPath(stormRoot);
+ return readSupervisorStormConfGivenPath(conf, confPath);
+ }
+
+ public static StormTopology readSupervisorTopology(Map conf, String
stormId) throws IOException {
+ String stormRoot = supervisorStormDistRoot(conf, stormId);
+ String topologyPath = supervisorStormCodePath(stormRoot);
+ return Utils.deserialize(FileUtils.readFileToByteArray(new
File(topologyPath)), StormTopology.class);
+ }
+
+ public static String workerUserRoot(Map conf) {
+ return (absoluteStormLocalDir(conf) + FILE_SEPARATOR +
"/workers-users");
+ }
+
+ /* Never get used TODO : may delete it*/
+ public static String workerUserFile(Map conf, String workerId) {
+ return (workerUserRoot(conf) + FILE_SEPARATOR + workerId);
+ }
+
+ public static String getWorkerUser(Map conf, String workerId) {
+ LOG.info("GET worker-user for {}", workerId);
+ File file = new File(workerUserFile(conf, workerId));
+
+ try (InputStream in = new FileInputStream(file);
+ Reader reader = new InputStreamReader(in);
+ BufferedReader br = new BufferedReader(reader);) {
+ StringBuilder sb = new StringBuilder();
+ int r;
+ while ((r = br.read()) != -1) {
+ char ch = (char)r;
+ sb.append(ch);
+ }
+ String ret = sb.toString().trim();
+ return ret;
+ } catch (IOException e) {
+ LOG.error("Failed to get worker user for " + workerId + ".");
+ return null;
+ }
+ }
+
+ public static String getIdFromBlobKey(String key) {
+ if (key == null) return null;
+ String ret = null;
+ if (key.endsWith("-stormjar.jar")) {
+ ret = key.substring(0, key.length() - 13);
+ } else if (key.endsWith("-stormcode.ser")) {
+ ret = key.substring(0, key.length() - 14);
+ } else if (key.endsWith("-stormconf.ser")) {
+ ret = key.substring(0, key.length() - 14);
+ }
+ return ret;
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedWorkerUserWSE mocked = new
SetMockedWorkerUserWSE(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedWorkerUserWSE. conf)]
+ // run test ...)
+ public static class SetMockedWorkerUserWSE implements Closeable {
+ public SetMockedWorkerUserWSE(Map conf) {
+ mockedWorkerUserWSE = conf;
+ }
+
+ @Override
+ public void close() {
+ mockedWorkerUserWSE = null;
+ }
+ }
+ private static Map mockedWorkerUserWSE = null;
+ public static void setWorkerUserWSE(Map conf, String workerId, String
user) throws IOException {
+ if (mockedWorkerUserWSE != null) {
+ return;
+ }
+ LOG.info("SET worker-user {} {}", workerId, user);
+ File file = new File(workerUserFile(conf, workerId));
+ file.getParentFile().mkdirs();
+
+ try (FileWriter fw = new FileWriter(file);
+ BufferedWriter writer = new BufferedWriter(fw);) {
+ writer.write(user);
+ }
+ }
+
+ public static void removeWorkerUserWSE(Map conf, String workerId) {
+ LOG.info("REMOVE worker-user {}", workerId);
+ new File(workerUserFile(conf, workerId)).delete();
+ }
+
+ //For testing only
+ // for java
+ // try (SetMockedWorkerArtifactsRoot mocked = new
SetMockedWorkerArtifactsRoot(conf)) {
+ // run test ...
+ // }
+ //
+ // for clojure
+ // (with-open [mock (SetMockedWorkerArtifactsRoot. root)]
+ // run test ...)
+ public static class SetMockedWorkerArtifactsRoot implements Closeable {
+ public SetMockedWorkerArtifactsRoot(String root) {
+ mockedWorkerArtifactsRoot = root;
+ }
+
+ @Override
+ public void close() {
+ mockedWorkerArtifactsRoot = null;
+ }
+ }
+ private static String mockedWorkerArtifactsRoot = null;
+ public static String workerArtifactsRoot(Map conf) {
+ if (mockedWorkerArtifactsRoot != null) {
+ return mockedWorkerArtifactsRoot;
+ }
+ String artifactsDir =
(String)conf.get(Config.STORM_WORKERS_ARTIFACTS_DIR);
+ if (artifactsDir == null) {
+ return (LOG_DIR + FILE_SEPARATOR + "workers-artifacts");
+ } else {
+ if (new File(artifactsDir).isAbsolute()) {
+ return artifactsDir;
+ } else {
+ return (LOG_DIR + FILE_SEPARATOR + artifactsDir);
+ }
+ }
+ }
+
+ public static String workerArtifactsRoot(Map conf, String id) {
+ if (mockedWorkerArtifactsRoot != null) {
+ return mockedWorkerArtifactsRoot;
+ }
+ return (workerArtifactsRoot(conf) + FILE_SEPARATOR + id);
+ }
+
+ public static String workerArtifactsRoot(Map conf, String id, Integer
port) {
+ if (mockedWorkerArtifactsRoot != null) {
+ return mockedWorkerArtifactsRoot;
+ }
+ return (workerArtifactsRoot(conf, id) + FILE_SEPARATOR + port);
+ }
+
+ public static String workerArtifactsPidPath(Map conf, String id,
Integer port) {
+ return (workerArtifactsRoot(conf, id, port) + FILE_SEPARATOR +
"worker.pid");
+ }
+
+ public static File getLogMetaDataFile(String fname) {
+ String[] subStrings = fname.split(FILE_SEPARATOR); // TODO: does
this work well on windows?
+ String id = subStrings[0];
+ Integer port = Integer.parseInt(subStrings[1]);
+ return getLogMetaDataFile(Utils.readStormConfig(), id, port);
+ }
+
+ public static File getLogMetaDataFile(Map conf, String id, Integer
port) {
+ String fname = workerArtifactsRoot(conf, id, port) +
FILE_SEPARATOR + "worker.yaml";
+ return new File(fname);
+ }
+
+ public static File getWorkerDirFromRoot(String logRoot, String id,
Integer port) {
+ return new File((logRoot + FILE_SEPARATOR + id + FILE_SEPARATOR +
port));
+ }
+
+ public static String workerRoot(Map conf) {
+ return (absoluteStormLocalDir(conf) + FILE_SEPARATOR + "workers");
+ }
+
+ public static String workerRoot(Map conf, String id) {
+ return (workerRoot(conf) + FILE_SEPARATOR + id);
+ }
+
+ public static String workerPidsRoot(Map conf, String id) {
+ return (workerRoot(conf, id) + FILE_SEPARATOR + "pids");
+ }
+
+ public static String workerPidPath(Map conf, String id, String pid) {
+ return (workerPidsRoot(conf, id) + FILE_SEPARATOR + pid);
+ }
+
+ public static String workerHeartbeatsRoot(Map conf, String id) {
+ return (workerRoot(conf, id) + FILE_SEPARATOR + "heartbeats");
+ }
+
+ public static LocalState workerState(Map conf, String id) throws
IOException {
+ return new LocalState(workerHeartbeatsRoot(conf, id));
+ }
+
+ public static Map overrideLoginConfigWithSystemProperty(Map conf) { //
note that we delete the return value
+ String loginConfFile =
System.getProperty("java.security.auth.login.config");
+ if (loginConfFile != null) {
+ conf.put("java.security.auth.login.config", loginConfFile);
+ }
+ return conf;
+ }
+
+ /* TODO: make sure test these two functions in manual tests */
+ public static List<String> getTopoLogsUsers(Map topologyConf) {
+ List<String> logsUsers =
(List<String>)topologyConf.get(Config.LOGS_USERS);
+ List<String> topologyUsers =
(List<String>)topologyConf.get(Config.TOPOLOGY_USERS);
+ Set<String> mergedUsers = new HashSet<String>();
+ if (logsUsers != null) {
+ for (String user : logsUsers) {
+ if (user != null) {
+ mergedUsers.add(user);
+ }
+ }
+ }
+ if (topologyUsers != null) {
+ for (String user : topologyUsers) {
+ if (user != null) {
+ mergedUsers.add(user);
+ }
+ }
+ }
--- End diff --
And this can similarly be
```
if (topologyUsers != null) {
mergedUsers.addAll(topologyUsers);
}
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
