Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/120#discussion_r20514725
--- Diff: storm-core/src/jvm/backtype/storm/utils/Utils.java ---
@@ -122,36 +124,64 @@ public static void sleep(long millis) {
}
}
+ // Will try to locate the config file in class path first, then will
search local path
+ // For example, we can use temporary config path like this: storm jar
job.jar --config /tmp/xx.yaml
public static Map findAndReadConfigFile(String name, boolean
mustExist) {
+ InputStream in = null;
try {
- HashSet<URL> resources = new HashSet<URL>(findResources(name));
- if(resources.isEmpty()) {
- if(mustExist) throw new RuntimeException("Could not find
config file on classpath " + name);
- else return new HashMap();
- }
- if(resources.size() > 1) {
- throw new RuntimeException("Found multiple " + name + "
resources. You're probably bundling the Storm jars with your topology jar. "
- + resources);
- }
- URL resource = resources.iterator().next();
- Yaml yaml = new Yaml(new SafeConstructor());
- Map ret = null;
- InputStream input = resource.openStream();
- try {
- ret = (Map) yaml.load(new InputStreamReader(input));
- } finally {
- input.close();
+ in = getConfigFileInputStream(name);
+ if (null != in) {
+ Yaml yaml = new Yaml();
+ Map ret = (Map) yaml.load(new InputStreamReader(in));
+ if (null != ret) {
+ return new HashMap(ret);
+ }
}
- if(ret==null) ret = new HashMap();
-
- return new HashMap(ret);
-
+ if (mustExist) {
+ throw new RuntimeException("Could not find config file on
classpath " + name);
+ } else {
+ return new HashMap();
+ }
} catch (IOException e) {
throw new RuntimeException(e);
+ } finally {
+ if (null != in) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ private static InputStream getConfigFileInputStream(String
configFilePath)
+ throws IOException {
+ if (null == configFilePath) {
+ throw new IOException(
+ "Could not find config file, name not specified");
+ }
+
+ HashSet<URL> resources = new
HashSet<URL>(findResources(configFilePath));
+ if (resources.isEmpty()) {
+ File configFile = new File(configFilePath);
+ if (configFile.exists()) {
+ return new FileInputStream(configFile);
+ }
+ } else if (resources.size() > 1) {
+ throw new IOException(
+ "Found multiple " + configFilePath
+ + " resources. You're probably bundling the
Storm jars with your topology jar. "
+ + resources);
+ } else {
+ URL resource = resources.iterator().next();
--- End diff --
It might be nice to log something here, so that the user knows that we are
using a config file from the classpath. I just thought about the case where
someone creates a ./storm.yaml file and passes it in with --config. They will
get the storm.yaml from the classpath without knowing it, because the classpath
is searched prior to the absolute path being searched, and this would be really
confusing.
---
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.
---
