Commit b142c03d authored by Marc Vef's avatar Marc Vef
Browse files

Better pssh handling in scripts

parent 20842118

ifs/scripts/clone_dep.sh

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ if [ "$CLUSTER" == "mogon1" ]; then 
    wgetdeps "lz4" "https://github.com/lz4/lz4/archive/v1.8.0.tar.gz"

	# get snappy for rocksdb

    wgetdeps "snappy" "https://github.com/google/snappy/archive/1.1.7.tar.gz"

	# get pssh

	wgetdeps "pssh" "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-2.3.1.tar.gz"

fi



# get BMI

ifs/scripts/compile_dep.sh

+0 −8
Original line number Diff line number Diff line
@@ -115,14 +115,6 @@ if [ "$CLUSTER" == "mogon1" ]; then 
    cmake -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE:STRING=Release .. || exit 1

    make -j$CORES || exit 1

    make install || exit 1

	echo "############################################################ Installing:  pssh"

	CURR=$GIT/pssh

	cd $CURR

	python2 setup.py install

    if [ ! -d "$INSTALL/bin" ]; then

		mkdir $INSTALL/bin

	fi

	mv $CURR/bin/* $INSTALL/bin/ || exit 1

fi



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

ifs/scripts/shutdown_adafs.py

+6 −4
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ global WAITTIME 
def check_dependencies():

    global PSSH_PATH

    """Check if pssh is installed"""

    if os.path.exists('/usr/bin/pssh'):

        PSSH_PATH = '/usr/bin/pssh'

    pssh_path = os.popen('which pssh').read().strip()

    if pssh_path != '':

        PSSH_PATH = pssh_path

        return

    if os.path.exists('/usr/bin/parallel-ssh'):

        PSSH_PATH = '/usr/bin/parallel-ssh'

    pssh_path = os.popen('which parallel-ssh').read().strip()

    if pssh_path != '':

        PSSH_PATH = pssh_path

        return

    print '[ERR] parallel-ssh/pssh executable cannot be found. Please add it to the parameter list'

    exit(1)

ifs/scripts/startup_adafs.py

+6 −4
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ global WAITTIME 
def check_dependencies():

    global PSSH_PATH

    """Check if pssh is installed"""

    if os.path.exists('/usr/bin/pssh'):

        PSSH_PATH = '/usr/bin/pssh'

    pssh_path = os.popen('which pssh').read().strip()

    if pssh_path != '':

        PSSH_PATH = pssh_path

        return

    if os.path.exists('/usr/bin/parallel-ssh'):

        PSSH_PATH = '/usr/bin/parallel-ssh'

    pssh_path = os.popen('which parallel-ssh').read().strip()

    if pssh_path != '':

        PSSH_PATH = pssh_path

        return

    print '[ERR] parallel-ssh/pssh executable cannot be found. Please add it to the parameter list'

    exit(1)