Minor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7a302e3b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7a302e3b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7a302e3b Branch: refs/heads/master Commit: 7a302e3bc5b6652642ed5fb9ff6f4fed8607680f Parents: c1b93de Author: zhuol <[email protected]> Authored: Fri Mar 18 16:11:50 2016 -0500 Committer: zhuol <[email protected]> Committed: Fri Mar 18 16:11:50 2016 -0500 ---------------------------------------------------------------------- storm-core/src/jvm/org/apache/storm/Config.java | 2 +- .../jvm/org/apache/storm/utils/ConfigUtils.java | 20 ++++++++++---------- .../resource/TestResourceAwareScheduler.java | 1 - 3 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/7a302e3b/storm-core/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java index 6ea8b0f..05030e8 100644 --- a/storm-core/src/jvm/org/apache/storm/Config.java +++ b/storm-core/src/jvm/org/apache/storm/Config.java @@ -232,7 +232,7 @@ public class Config extends HashMap<String, Object> { /** * Whether we want to display all the resource capacity and scheduled usage on the UI page. - * We suggest to have this variable set if you are using any kind of resource-related scheduler. + * You MUST have this variable set if you are using any kind of resource-related scheduler. * * If this is not set, we will not display resource capacity and usage on the UI. */ http://git-wip-us.apache.org/repos/asf/storm/blob/7a302e3b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java index c6543d4..ed3d305 100644 --- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java +++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java @@ -129,7 +129,7 @@ public class ConfigUtils { // public static mkStatsSampler // depends on Utils.evenSampler() TODO, this is sth we need to do after util - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static Map readStormConfig() { return _instance.readStormConfigImpl(); } @@ -235,7 +235,7 @@ public class ConfigUtils { return (masterLocalDir(conf) + FILE_SEPARATOR + "inimbus"); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static String supervisorLocalDir(Map conf) throws IOException { return _instance.supervisorLocalDirImpl(conf); } @@ -250,7 +250,7 @@ public class ConfigUtils { return (supervisorLocalDir(conf) + FILE_SEPARATOR + "isupervisor"); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static String supervisorStormDistRoot(Map conf) throws IOException { return _instance.supervisorStormDistRootImpl(conf); } @@ -259,7 +259,7 @@ public class ConfigUtils { return stormDistPath(supervisorLocalDir(conf)); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static String supervisorStormDistRoot(Map conf, String stormId) throws IOException { return _instance.supervisorStormDistRootImpl(conf, stormId); } @@ -299,7 +299,7 @@ public class ConfigUtils { return (concatIfNotNull(stormRoot) + FILE_SEPARATOR + RESOURCES_SUBDIR); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static LocalState supervisorState(Map conf) throws IOException { return _instance.supervisorStateImpl(conf); } @@ -308,7 +308,7 @@ public class ConfigUtils { return new LocalState((supervisorLocalDir(conf) + FILE_SEPARATOR + "localstate")); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static LocalState nimbusTopoHistoryState(Map conf) throws IOException { return _instance.nimbusTopoHistoryStateImpl(conf); } @@ -317,7 +317,7 @@ public class ConfigUtils { return new LocalState((masterLocalDir(conf) + FILE_SEPARATOR + "history")); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static Map readSupervisorStormConf(Map conf, String stormId) throws IOException { return _instance.readSupervisorStormConfImpl(conf, stormId); } @@ -380,7 +380,7 @@ public class ConfigUtils { return ret; } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static void setWorkerUserWSE(Map conf, String workerId, String user) throws IOException { _instance.setWorkerUserWSEImpl(conf, workerId, user); } @@ -401,7 +401,7 @@ public class ConfigUtils { new File(workerUserFile(conf, workerId)).delete(); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static String workerArtifactsRoot(Map conf) { return _instance.workerArtifactsRootImpl(conf); } @@ -447,7 +447,7 @@ public class ConfigUtils { return new File((logRoot + FILE_SEPARATOR + id + FILE_SEPARATOR + port)); } - // we use this "wired" wrapper pattern temporarily for mocking in clojure test + // we use this "weird" wrapper pattern temporarily for mocking in clojure test public static String workerRoot(Map conf) { return _instance.workerRootImpl(conf); } http://git-wip-us.apache.org/repos/asf/storm/blob/7a302e3b/storm-core/test/jvm/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java ---------------------------------------------------------------------- diff --git a/storm-core/test/jvm/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java b/storm-core/test/jvm/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java index e0336ea..28fd491 100644 --- a/storm-core/test/jvm/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java +++ b/storm-core/test/jvm/org/apache/storm/scheduler/resource/TestResourceAwareScheduler.java @@ -63,7 +63,6 @@ public class TestResourceAwareScheduler { private static final Config defaultTopologyConf = new Config(); - @BeforeClass public static void initConf() { defaultTopologyConf.put(Config.STORM_NETWORK_TOPOGRAPHY_PLUGIN, "org.apache.storm.networktopography.DefaultRackDNSToSwitchMapping");
