You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/10/22 11:37:29 UTC
[1/4] git commit: SLIDER-553 funtests to permit launching of
slider.py on unix
Repository: incubator-slider
Updated Branches:
refs/heads/develop 46e131df6 -> e13d20e3a
SLIDER-553 funtests to permit launching of slider.py on unix
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/86639d21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/86639d21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/86639d21
Branch: refs/heads/develop
Commit: 86639d21b182ee1e0b8969301454ee226b01b9f3
Parents: 46e131d
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 22 10:31:08 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 22 10:31:08 2014 +0100
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider.py | 5 +++--
.../slider/funtest/framework/CommandTestBase.groovy | 13 ++++++++++---
.../slider/funtest/framework/FuntestProperties.groovy | 5 +++++
.../slider/funtest/lifecycle/AgentRegistryIT.groovy | 5 ++---
4 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86639d21/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 94e40a2..c8ea0ce 100644
--- a/slider-assembly/src/main/scripts/slider.py
+++ b/slider-assembly/src/main/scripts/slider.py
@@ -51,8 +51,9 @@ to explain the code here
"""
def executeEnvSh(confDir):
- if not IS_WINDOWS:
- envCmd = 'source %s/slider-env.sh && env' % confDir
+ envscript = '%s/slider-env.sh' % confDir
+ if not IS_WINDOWS and os.path.exists(envscript):
+ envCmd = 'source %s && env' % envscript
command = ['bash', '-c', envCmd]
proc = subprocess.Popen(command, stdout = subprocess.PIPE)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86639d21/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 58c61ea..9230a7a 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -87,8 +87,8 @@ abstract class CommandTestBase extends SliderTestUtils {
* shell-escaped ~ symbol. On windows this does
* not need to be escaped
*/
- static final String TILDE
-
+ public static final String TILDE
+
/*
Static initializer for test configurations. If this code throws exceptions
(which it may) the class will not be instantiable.
@@ -113,6 +113,8 @@ abstract class CommandTestBase extends SliderTestUtils {
TEST_AM_KEYTAB = SLIDER_CONFIG.getTrimmed(
KEY_TEST_AM_KEYTAB)
+
+
TILDE = Shell.WINDOWS? "~" : "\\~"
}
@@ -126,7 +128,12 @@ abstract class CommandTestBase extends SliderTestUtils {
Configuration conf = loadSliderConf();
SliderShell.confDir = SLIDER_CONF_DIRECTORY
- SliderShell.scriptFile = SliderShell.windows ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
+
+ // choose python script if on windows or the launch key recommends it
+ //
+ boolean python = SLIDER_CONFIG.getBoolean(KEY_LAUNCH_PYTHON, false)
+ SliderShell.scriptFile =
+ (SliderShell.windows || python) ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
//set the property of the configuration directory
def path = SLIDER_CONF_DIRECTORY.absolutePath
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86639d21/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
index 7d38ffc..92a7a95 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
@@ -74,4 +74,9 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting {
String CORE_SITE_XML = "core-site.xml"
String HDFS_SITE_XML = "hdfs-site.xml"
String YARN_SITE_XML = "yarn-site.xml"
+
+ /**
+ * Flag to indicate that the .py script should be launched: {@value}
+ */
+ String KEY_LAUNCH_PYTHON = "slider.test.launch.python"
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86639d21/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
index 2df5f56..50da8ae 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
@@ -49,7 +49,7 @@ public class AgentRegistryIT extends AgentCommandTestBase
@Before
public void prepareCluster() {
setupCluster(CLUSTER)
- describe("Create a 0-role cluster and make registry queries against it")
+
}
@@ -60,8 +60,7 @@ public class AgentRegistryIT extends AgentCommandTestBase
@Test
public void testAgentClusterLifecycle() throws Throwable {
-
- describe "Walk a 0-role cluster through its lifecycle"
+ describe("Create a 0-role cluster and make registry queries against it")
// sanity check to verify the config is correct
assert clusterFS.uri.scheme != "file"
[2/4] git commit: SLIDER-550 custom JVM ops lose slider conf dir:
bin/slider
Posted by st...@apache.org.
SLIDER-550 custom JVM ops lose slider conf dir: bin/slider
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1e51d6db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1e51d6db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1e51d6db
Branch: refs/heads/develop
Commit: 1e51d6db6132c3a21b3ee64dcfba07025a383908
Parents: 86639d2
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 22 10:36:32 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 22 10:36:32 2014 +0100
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1e51d6db/slider-assembly/src/main/scripts/slider
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider
index 787016a..4228843 100755
--- a/slider-assembly/src/main/scripts/slider
+++ b/slider-assembly/src/main/scripts/slider
@@ -55,7 +55,8 @@ if [ -f "${confdir}/slider-env.sh" ]; then
. "${confdir}/slider-env.sh"
fi
-slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Dslider.confdir=${confdir}"
+slider_confdir_opts="-Dslider.confdir=${confdir}"
+slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m"
slider_jvm_opts=${SLIDER_JVM_OPTS:-$slider_jvm_opts}
# allow for an extra classpath
@@ -87,4 +88,4 @@ fi
#echo $javabin
#type ${javabin}java 2>&1
-exec ${javabin}java ${slider_jvm_opts} ${launcher} $@
+exec ${javabin}java ${slider_jvm_opts} ${slider_confdir_opts} ${launcher} $@
[3/4] git commit: SLIDER-550 custom JVM ops lose slider conf dir:
bin/slider.py
Posted by st...@apache.org.
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 <st...@apache.org>
Authored: Wed Oct 22 10:37:07 2014 +0100
Committer: Steve Loughran <st...@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__':
"""
[4/4] git commit: Merge branch
'feature/SLIDER-550_custom_JVM_ops_lose_slider_conf_dir' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-550_custom_JVM_ops_lose_slider_conf_dir' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e13d20e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e13d20e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e13d20e3
Branch: refs/heads/develop
Commit: e13d20e3a31b26e1353f87c8c69ab0cf0efd8746
Parents: 46e131d b48ad06
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 22 10:37:15 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 22 10:37:15 2014 +0100
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider | 5 +++--
slider-assembly/src/main/scripts/slider.py | 21 +++++++++++---------
.../funtest/framework/CommandTestBase.groovy | 13 +++++++++---
.../funtest/framework/FuntestProperties.groovy | 5 +++++
.../funtest/lifecycle/AgentRegistryIT.groovy | 5 ++---
5 files changed, 32 insertions(+), 17 deletions(-)
----------------------------------------------------------------------