You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 06:59:14 UTC

svn commit: r1131700 - in /incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2: nmpiexec prologue.parallel.setup-mpi-conf setup setup-torque

Author: benh
Date: Sun Jun  5 04:59:13 2011
New Revision: 1131700

URL: http://svn.apache.org/viewvc?rev=1131700&view=rev
Log:
fixed typo in setup-mpi-conf, file should be mpd.conf not mpi.conf. adding new scripts to have their execution permissions set in setup. rearranged ordering of torque-setup so that mpi gets installed after torque slave moms since it needs to copy prologue stuff into /var/spool/torque/mom_priv dir which is created by torque part

Removed:
    incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nmpiexec
Modified:
    incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.parallel.setup-mpi-conf
    incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup
    incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque

Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.parallel.setup-mpi-conf
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.parallel.setup-mpi-conf?rev=1131700&r1=1131699&r2=1131700&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.parallel.setup-mpi-conf (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/prologue.parallel.setup-mpi-conf Sun Jun  5 04:59:13 2011
@@ -1,7 +1,6 @@
-#! /usr/bin/env bash
+#! /usr/bin/env sh
 
-apt-get -y install mpich2
-
-touch /etc/mpi.conf
-chmod 600 /etc/mpi.conf
-echo "MPD_SECRETWORD=$1" | cat >> /etc/mpi.conf
+touch /etc/mpd.conf
+chmod 600 /etc/mpd.conf
+echo "MPD_SECRETWORD=$1" | cat >> /etc/mpd.conf
+echo "finished setting up /etc/mpd.conf with value MPD_SECRETWORK=$1"

Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup?rev=1131700&r1=1131699&r2=1131700&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup Sun Jun  5 04:59:13 2011
@@ -22,6 +22,12 @@ SCRIPTS="copy-dir
          setup-apache
          setup-slave              
          setup-torque
+         setup-torque-server
+         start-torque-slaves
+         stop-torque-slaves
+         prologue.parallel.setup-mpi-conf
+         prologue.setup-mpi-master
+         setup-mpi
          ssh-no-keychecking
          start-mos
          start-nexus

Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque?rev=1131700&r1=1131699&r2=1131700&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/setup-torque Sun Jun  5 04:59:13 2011
@@ -55,15 +55,6 @@ function setuptorque {
 	popd
 }
 
-function setupmpi {
-        ./setup-mpi
-        #setup epilog script
-        cp prologue.setup-mpi-master /var/spool/torque/mom_priv/prologue
-        cp prologue.parallel.setup-mpi-conf /var/spool/torque/mom_priv/prologue.parallel
-        
-	for i in `cat $SLAVES_FILE`; do scp prologue.setup-mpi-master $i:/var/spool/torque/mom_priv/prologue; done
-	for i in `cat $SLAVES_FILE`; do scp prologue.parallel.setup-mpi-conf $i:/var/spool/torque/mom_priv/prologue.parallel; done
-}
 
 function installslaves {
 	pushd ~/torque-2.4.7
@@ -86,7 +77,19 @@ function installslaves {
 	popd
 }
 
+function installmpi {
+        #setup mpich2 on all of the cluster nodes
+        ./setup-mpi
+
+        #setup prologue script
+        cp prologue.setup-mpi-master /var/spool/torque/mom_priv/prologue
+        cp prologue.parallel.setup-mpi-conf /var/spool/torque/mom_priv/prologue.parallel
+        
+	for i in `cat $SLAVES_FILE`; do scp prologue.setup-mpi-master $i:/var/spool/torque/mom_priv/prologue; done
+	for i in `cat $SLAVES_FILE`; do scp prologue.parallel.setup-mpi-conf $i:/var/spool/torque/mom_priv/prologue.parallel; done
+}
+
 #installtorque
 setuptorque
 #installslaves
-setupmpi
+installmpi