SLIDER-405. Minor changes to the rpm and scripts to facilitate easy deployment
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8da15036 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8da15036 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8da15036 Branch: refs/heads/feature/update_storm_for_93 Commit: 8da150363571f7ab1a0b018593bc5907d501748d Parents: 486ef84 Author: Sumit Mohanty <[email protected]> Authored: Sat Sep 6 08:32:07 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Sat Sep 6 08:32:07 2014 -0700 ---------------------------------------------------------------------- slider-assembly/pom.xml | 23 +++++++++++++++++++++-- slider-assembly/src/main/scripts/slider | 2 ++ slider-assembly/src/main/scripts/slider.py | 10 +++++++--- 3 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8da15036/slider-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml index dbbd722..c2d0ecb 100644 --- a/slider-assembly/pom.xml +++ b/slider-assembly/pom.xml @@ -33,7 +33,7 @@ <rpm.bindir>${rpm.basedir}/bin</rpm.bindir> <rpm.libdir>${rpm.basedir}/lib</rpm.libdir> <rpm.agentdir>${rpm.basedir}/agent</rpm.agentdir> - <rpm.username>mapred</rpm.username> + <rpm.username>root</rpm.username> <rpm.groupname>hadoop</rpm.groupname> <src.confdir>src/conf-hdp</src.confdir> <src.libdir>${project.build.directory}/lib</src.libdir> @@ -287,10 +287,10 @@ <!-- agent --> <mapping> <directory>${rpm.agentdir}</directory> - <configuration>true</configuration> <filemode>0755</filemode> <username>${rpm.username}</username> <groupname>${rpm.groupname}</groupname> + <directoryIncluded>false</directoryIncluded> <sources> <source> <location>${project.build.directory}/agent</location> @@ -308,6 +308,7 @@ <filemode>0755</filemode> <username>${rpm.username}</username> <groupname>${rpm.groupname}</groupname> + <directoryIncluded>false</directoryIncluded> <sources> <source> <location>${src.agent.ini.dir}</location> @@ -318,6 +319,24 @@ </source> </sources> </mapping> + + <!-- needed to apply attribute to directory --> + <mapping> + <directory>${rpm.agentdir}</directory> + <filemode>0755</filemode> + <username>${rpm.username}</username> + <groupname>${rpm.groupname}</groupname> + <directoryIncluded>true</directoryIncluded> + </mapping> + + <mapping> + <directory>${rpm.agentdir}/conf</directory> + <filemode>0755</filemode> + <username>${rpm.username}</username> + <groupname>${rpm.groupname}</groupname> + <directoryIncluded>true</directoryIncluded> + </mapping> + </mappings> <!-- Scripts. Very dangerous in RPMs unless you know exactly what you are doing. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8da15036/slider-assembly/src/main/scripts/slider ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider index 6cd55ad..477e237 100755 --- a/slider-assembly/src/main/scripts/slider +++ b/slider-assembly/src/main/scripts/slider @@ -22,6 +22,8 @@ # The env variable SLIDER_JVM_OPTS can be used to override # the default JVM opts +export JAVA_HOME=${JAVA_HOME} + function usage { echo "Usage: slider <action> <arguments>" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8da15036/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 be79973..cbc0faf 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -23,6 +23,7 @@ CONF = "conf" LIB = "lib" +JAVA_HOME = None SLIDER_CONF_DIR = "SLIDER_CONF_DIR" SLIDER_JVM_OPTS = "SLIDER_JVM_OPTS" SLIDER_CLASSPATH_EXTRA = "SLIDER_CLASSPATH_EXTRA" @@ -148,8 +149,11 @@ def java(classname, args, classpath, jvm_opts_list): # split the JVM opts by space # java = "/usr/bin/java" prg = "java" - if which("java") is None: - prg = os.environ["JAVA_HOME"] + "/bin/java" + if JAVA_HOME: + prg = os.path.join(JAVA_HOME, "bin", "java") + else: + if which("java") is None: + prg = os.path.join(os.environ["JAVA_HOME"], "bin", "java") commandline = [prg] commandline.extend(jvm_opts_list) commandline.append("-classpath") @@ -203,7 +207,7 @@ if __name__ == '__main__': try: returncode = main() except Exception as e: - print "Exception: %s " % e.message + print "Exception: %s " % str(e) returncode = -1 sys.exit(returncode)
