Commit 158f9a9e authored by Marc Vef's avatar Marc Vef
Browse files

Script improvements and fixes

parent 1d6ca225

ifs/scripts/compile_dep.sh

+9 −8
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ USE_BMI="-DNA_USE_BMI:BOOL=OFF" 
USE_CCI="-DNA_USE_CCI:BOOL=OFF"

USE_OFI="-DNA_USE_OFI:BOOL=OFF"



CORES=$(grep -c ^processor /proc/cpuinfo)



if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "bmi" ] || [ "$NA_LAYER" == "ofi" ] || [ "$NA_LAYER" == "all" ]; then

    echo "$NA_LAYER plugin(s) selected"
@@ -53,7 +54,7 @@ if [ "$NA_LAYER" == "bmi" ] || [ "$NA_LAYER" == "all" ]; then 
    ./prepare || exit 1

    cd $CURR/build

    ../configure --prefix=$INSTALL --enable-shared --enable-bmi-only  || exit 1

    make -j8 || exit 1

    make -j$CORES || exit 1

    make install || exit 1

fi
@@ -67,7 +68,7 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then 
    ./autogen.pl || exit 1

    cd $CURR/build

    ../configure --with-verbs --prefix=$INSTALL LIBS="-lpthread"  || exit 1

    make -j8 || exit 1

    make -j$CORES || exit 1

    make install || exit 1

    make check || exit 1

fi
@@ -82,7 +83,7 @@ if [ "$NA_LAYER" == "ofi" ] || [ "$NA_LAYER" == "all" ]; then 
    ./autogen.sh || exit 1

    cd $CURR/build

    ../configure --prefix=$INSTALL  || exit 1

    make -j8 || exit 1

    make -j$CORES || exit 1

    make install || exit 1

    make check || exit 1

fi
@@ -97,7 +98,7 @@ cd $CURR/build 
cmake -DMERCURY_USE_SELF_FORWARD:BOOL=ON -DMERCURY_USE_CHECKSUMS:BOOL=OFF -DBUILD_TESTING:BOOL=ON \

-DMERCURY_USE_BOOST_PP:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL \

-DCMAKE_BUILD_TYPE:STRING=Release -DMERCURY_USE_EAGER_BULK:BOOL=OFF $USE_BMI $USE_CCI $USE_OFI ../  || exit 1

make -j8  || exit 1

make -j$CORES  || exit 1

make install  || exit 1



echo "Installing Argobots"
@@ -109,7 +110,7 @@ cd $CURR 
./autogen.sh || exit 1

cd $CURR/build

../configure --prefix=$INSTALL || exit 1

make -j8 || exit 1

make -j$CORES || exit 1

make install || exit 1

make check || exit 1
@@ -121,7 +122,7 @@ cd $CURR 
./prepare.sh || exit 1

cd $CURR/build

../configure --prefix=$INSTALL PKG_CONFIG_PATH=$INSTALL/lib/pkgconfig || exit 1

make -j8 || exit 1

make -j$CORES || exit 1

make install || exit 1

make check || exit 1
@@ -133,7 +134,7 @@ cd $CURR 
./prepare.sh || exit 1

cd $CURR/build

../configure --prefix=$INSTALL PKG_CONFIG_PATH=$INSTALL/lib/pkgconfig CFLAGS="-g -Wall" || exit 1

make -j8 || exit 1

make -j$CORES || exit 1

make install || exit 1

make check || exit 1
@@ -143,7 +144,7 @@ CURR=$GIT/rocksdb 
cd $CURR

make clean || exit 1

sed -i.bak "s#INSTALL_PATH ?= /usr/local#INSTALL_PATH ?= $INSTALL#g" Makefile

make -j8 static_lib || exit 1

make -j$CORES static_lib || exit 1

make install || exit 1



echo "Done"

ifs/scripts/shutdown_adafs.py

+6 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ def shutdown_system(daemon_path, nodelist, sigkill): 
    global WAITTIME

    # get absolute paths

    daemon_path = os.path.realpath(os.path.expanduser(daemon_path))

    pssh_nodelist = ''

    if not os.path.exists(daemon_path) or not os.path.isfile(daemon_path):

        print '[ERR] Daemon executable not found or not a file'

        exit(1)
@@ -49,15 +50,14 @@ def shutdown_system(daemon_path, nodelist, sigkill): 
    if os.path.exists(nodelist):

        nodefile = True  # TODO

        print 'Nodefiles are not supported yet'

    else:

        nodelist.replace(',', ' ')

    if PSSH_PATH is '':

        check_dependencies()

    # get absolute daemon path

    # set pssh arguments

    pssh = '%s -O StrictHostKeyChecking=no -i -H "%s"' % (PSSH_PATH, nodelist.replace(',', ' '))

    if sigkill:

        cmd_str = '%s -i -H "%s" "pkill -f -SIGKILL \"%s\""' % (PSSH_PATH, nodelist, daemon_path)

        cmd_str = '%s "pkill -f -SIGKILL \"%s\""' % (pssh, daemon_path)

    else:

        cmd_str = '%s -i -H "%s" "pkill -f -SIGTERM \"%s\""' % (PSSH_PATH, nodelist, daemon_path)

        cmd_str = '%s "pkill -f -SIGTERM \"%s\""' % (pssh, daemon_path)

    if PRETEND:

        print 'Pretending: %s' % cmd_str

    else:
@@ -86,7 +86,7 @@ def shutdown_system(daemon_path, nodelist, sigkill): 
        time.sleep(1)

    print 'Checking logs ...\n'



    cmd_chk_str = '%s -i -H "%s" "tail -4 /tmp/adafs_daemon.log"' % (PSSH_PATH, nodelist)

    cmd_chk_str = '%s "tail -4 /tmp/adafs_daemon.log"' % pssh

    if PRETEND:

        print 'Pretending: %s' % cmd_chk_str

    else:

ifs/scripts/startup_adafs.py

+6 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ def init_system(daemon_path, rootdir, mountdir, nodelist): 
    daemon_path = os.path.realpath(os.path.expanduser(daemon_path))

    mountdir = os.path.realpath(os.path.expanduser(mountdir))

    rootdir = os.path.realpath(os.path.expanduser(rootdir))

    pssh_nodelist = ''

    if not os.path.exists(daemon_path) or not os.path.isfile(daemon_path):

        print '[ERR] Daemon executable not found or not a file'

        exit(1)
@@ -50,12 +51,12 @@ def init_system(daemon_path, rootdir, mountdir, nodelist): 
        nodefile = True  # TODO

        print 'Nodefiles are not supported yet'

        exit(1)

    else:

        nodelist.replace(',', ' ')

    if PSSH_PATH is '':

        check_dependencies()

    cmd_str = '%s -i -H "%s" "nohup %s -r %s -m %s --hosts %s > /tmp/adafs_daemon.log 2>&1 &"' \

              % (PSSH_PATH, nodelist, daemon_path, rootdir, mountdir, nodelist)

    # set pssh arguments

    pssh = '%s -O StrictHostKeyChecking=no -i -H "%s"' % (PSSH_PATH, nodelist.replace(',', ' '))

    cmd_str = '%s "nohup %s -r %s -m %s --hosts %s > /tmp/adafs_daemon.log 2>&1 &"' \

              % (pssh, daemon_path, rootdir, mountdir, nodelist)

    if PRETEND:

        print 'Pretending: %s' % cmd_str

    else:
@@ -74,7 +75,7 @@ def init_system(daemon_path, rootdir, mountdir, nodelist): 
            print '[ERR] with pssh. Aborting. Please run shutdown_adafs.py to shut down orphan adafs daemons!'

            exit(1)



    cmd_chk_str = '%s -i -H "%s" "head -6 /tmp/adafs_daemon.log"' % (PSSH_PATH, nodelist)

    cmd_chk_str = '%s "head -6 /tmp/adafs_daemon.log"' % pssh

    if PRETEND:

        print 'Pretending: %s' % cmd_chk_str

    else: