SLIDER-550 custom JVM ops lose slider conf dir: bin/slider.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b48ad063 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b48ad063 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b48ad063 Branch: refs/heads/develop Commit: b48ad06330c7c21543da9aeb736c580187256999 Parents: 1e51d6d Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 22 10:37:07 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 22 10:37:07 2014 +0100 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b48ad063/slider-assembly/src/main/scripts/slider.py ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py index c8ea0ce..a6dd90e 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -33,7 +33,8 @@ SLIDER_CLASSPATH_EXTRA = "SLIDER_CLASSPATH_EXTRA" HADOOP_CONF_DIR = "HADOOP_CONF_DIR" SLIDER_CLASSNAME = "org.apache.slider.Slider" -DEFAULT_JVM__OPTS = "-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Dslider.confdir=%s" +SLIDER_CONFDIR_OPTS ="-Dslider.confdir=%s" +DEFAULT_JVM_OPTS = "-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m" ON_POSIX = 'posix' in sys.builtin_module_names @@ -244,9 +245,10 @@ def main(): libdir = dirMustExist(libDir(slider_home)) confdir = dirMustExist(confDir(slider_home)) executeEnvSh(confdir) - default_jvm_opts = DEFAULT_JVM__OPTS % confdir + jvm_opts_list = (SLIDER_CONFDIR_OPTS % confdir).split() + default_jvm_opts = DEFAULT_JVM_OPTS slider_jvm_opts = os.environ.get(SLIDER_JVM_OPTS, default_jvm_opts) - jvm_opts_split = slider_jvm_opts.split() + jvm_opts_list.extend(slider_jvm_opts.split()) slider_classpath_extra = os.environ.get(SLIDER_CLASSPATH_EXTRA, "") hadoop_conf_dir = os.environ.get(HADOOP_CONF_DIR, "") p = os.pathsep # path separator @@ -257,14 +259,14 @@ def main(): + hadoop_conf_dir - #print "slider_home = \"%s\"" % slider_home - #print "slider_jvm_opts = \"%s\"" % slider_jvm_opts - #print "slider_classpath = \"%s\"" % slider_classpath + debug("slider_home = \"%s\"" % slider_home) + debug("slider_jvm_opts = \"%s\"" % slider_jvm_opts) + debug("slider_classpath = \"%s\"" % slider_classpath) return java(SLIDER_CLASSNAME, args, slider_classpath, - jvm_opts_split) + jvm_opts_list) if __name__ == '__main__': """