Commit 1d6ca225 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'master' updates

parents 88e3d0ef 1c85e2dd

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ cmake-build-release 
playground

.fuse_hidden*



# python stuff

*.pyc



ifs/\.hidden_playground/



ifs_test/build/

ifs/scripts/compile_dep.sh

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then 
    cd $CURR

    ./autogen.pl || exit 1

    cd $CURR/build

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

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

    make -j8 || exit 1

    make install || exit 1

    make check || exit 1

ifs/scripts/shutdown_adafs.py

0 → 100644
+148 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python

# -*- coding: utf-8 -*-



import argparse

import time



import os



from util import util



__author__ = "Marc-Andre Vef"

__email__ = "vef@uni-mainz.de"



global PRETEND

global PSSH_PATH

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'

        return

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

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

        return

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

    exit(1)





def shutdown_system(daemon_path, nodelist, sigkill):

    """Shuts down ADAFS on specified nodes.



    Args:

        daemon_path (str): Path to daemon executable

        nodelist (str): Comma-separated list of nodes where adafs is launched on

        sigkill (bool): If true force kills daemons

    """

    global PSSH_PATH

    global PRETEND

    global WAITTIME

    # get absolute paths

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

    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)

    nodefile = False

    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

    if sigkill:

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

    else:

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

    if PRETEND:

        print 'Pretending: %s' % cmd_str

    else:

        print 'Running: %s' % cmd_str

        pssh_ret = util.exec_shell(cmd_str, True)

        err = False

        for line in pssh_ret:

            if 'FAILURE' in line.strip()[:30]:

                err = True

                print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

                      (line[line.find('FAILURE'):].strip().split(' ')[1])

                print line

        if not err:

            if sigkill:

                print 'pssh daemon launch successfully executed. FS daemons have been force killed ...'

                exit(1)

            else:

                print 'pssh daemon launch successfully executed. Checking for FS shutdown errors ...\n'

        else:

            print '[ERR] with pssh. Aborting...'

            exit(1)



    print 'Give it some time (%d second) to finish up ...' % WAITTIME

    for i in range(WAITTIME):

        print '%d\r' % (WAITTIME - i),

        time.sleep(1)

    print 'Checking logs ...\n'



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

    if PRETEND:

        print 'Pretending: %s' % cmd_chk_str

    else:

        print 'Running: %s' % cmd_chk_str

        pssh_ret = util.exec_shell(cmd_chk_str, True)

        err = False

        fs_err = False

        for line in pssh_ret:

            if line == '':

                continue

            if 'Failure' in line.strip()[:30]:

                err = True

                print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

                      (line[line.find('FAILURE'):].strip().split(' ')[1])

                print line

            else:

                # check for errors in log

                if not 'All services shut down.' in line[line.strip().find('\n') + 1:]:

                    fs_err = True

                    print '------------------------- WARN pssh -- Host "%s" -------------------------' % \

                          (line.strip().split(' ')[3].split('\n')[0])

                    print '%s' % line[line.find('\n') + 1:]



        if not err and not fs_err:

            print 'pssh logging check successfully executed. Looks prime.'

        else:

            print '[WARN] while checking fs logs. Something might went wrong when shutting down'

            exit(1)





if __name__ == "__main__":

    # Init parser

    parser = argparse.ArgumentParser(description='This script stops adafs on multiple nodes',

                                     formatter_class=argparse.RawTextHelpFormatter)

    # positional arguments

    parser.add_argument('daemonpath', type=str,

                        help='path to the daemon executable')

    parser.add_argument('nodelist', type=str,

                        help='''list of nodes where the file system is launched. This can be a comma-separated list

                             or a path to a nodefile (one node per line)''')



    # optional arguments

    parser.add_argument('-p', '--pretend', action='store_true',

                        help='Output adafs launch command and do not actually execute it')

    parser.add_argument('-9', '--sigkill', action='store_true',

                        help='Force kill adafs_daemons')

    parser.add_argument('-P', '--pssh', metavar='<PSSH_PATH>', type=str, default='',

                        help='Path to parallel-ssh/pssh. Defaults to /usr/bin/{parallel-ssh,pssh}')

    args = parser.parse_args()



    if args.pretend is True:

        PRETEND = True

    else:

        PRETEND = False

    PSSH_PATH = args.pssh

    WAITTIME = 10

    shutdown_system(args.daemonpath, args.nodelist, args.sigkill)



    print '\nNothing left to do; exiting. :)'

ifs/scripts/startup_adafs.py

0 → 100644
+135 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python

# -*- coding: utf-8 -*-



import argparse



import os



from util import util



__author__ = "Marc-Andre Vef"

__email__ = "vef@uni-mainz.de"



global PRETEND

global PSSH_PATH





def check_dependencies():

    global PSSH_PATH

    """Check if pssh is installed"""

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

        PSSH_PATH = '/usr/bin/pssh'

        return

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

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

        return

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

    exit(1)





def init_system(daemon_path, rootdir, mountdir, nodelist):

    """Initializes ADAFS on specified nodes.



    Args:

        daemon_path (str): Path to daemon executable

        rootdir (str): Path to root directory for fs data

        mountdir (str): Path to mount directory where adafs is used in

        nodelist (str): Comma-separated list of nodes where adafs is launched on

    """

    global PSSH_PATH

    global PRETEND

    # get absolute paths

    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))

    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)

    nodefile = False

    if os.path.exists(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)

    if PRETEND:

        print 'Pretending: %s' % cmd_str

    else:

        print 'Running: %s' % cmd_str

        pssh_ret = util.exec_shell(cmd_str, True)

        err = False

        for line in pssh_ret:

            if 'FAILURE' in line.strip()[:30]:

                err = True

                print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

                      (line[line.find('FAILURE'):].strip().split(' ')[1])

                print line

        if not err:

            print 'pssh daemon launch successfully executed. Checking for FS startup errors ...\n'

        else:

            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)

    if PRETEND:

        print 'Pretending: %s' % cmd_chk_str

    else:

        print 'Running: %s' % cmd_chk_str

        pssh_ret = util.exec_shell(cmd_chk_str, True)

        err = False

        fs_err = False

        for line in pssh_ret:

            if 'Failure' in line.strip()[:30]:

                err = True

                print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

                      (line[line.find('FAILURE'):].strip().split(' ')[1])

                print line

            else:

                # check for errors in log

                if 'ERROR' in line[line.strip().find('\n') + 1:] or 'Assertion `err\'' in line[

                                                                                          line.strip().find('\n') + 1:]:

                    fs_err = True

                    print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

                          (line.strip().split(' ')[3].split('\n')[0])

                    print '%s' % line[line.find('\n') + 1:]



        if not err and not fs_err:

            print 'pssh logging check successfully executed. Looks prime.'

        else:

            print '[ERR] while checking fs logs. Aborting. Please run shutdown_adafs.py to shut down orphan adafs daemons!'

            exit(1)





if __name__ == "__main__":

    # Init parser

    parser = argparse.ArgumentParser(description='This script launches adafs on multiple nodes',

                                     formatter_class=argparse.RawTextHelpFormatter)

    # positional arguments

    parser.add_argument('daemonpath', type=str,

                        help='path to the daemon executable')

    parser.add_argument('rootdir', type=str,

                        help='path to the root directory where all data will be stored')

    parser.add_argument('mountdir', type=str,

                        help='path to the mount directory of the file system')

    parser.add_argument('nodelist', type=str,

                        help='''list of nodes where the file system is launched. This can be a comma-separated list

or a path to a nodefile (one node per line)''')



    # optional arguments

    parser.add_argument('-p', '--pretend', action='store_true',

                        help='Output adafs launch command and do not actually execute it')

    parser.add_argument('-P', '--pssh', metavar='<PSSH_PATH>', type=str, default='',

                        help='Path to parallel-ssh/pssh. Defaults to /usr/bin/{parallel-ssh,pssh}')

    args = parser.parse_args()

    if args.pretend:

        PRETEND = True

    else:

        PRETEND = False

    PSSH_PATH = args.pssh

    init_system(args.daemonpath, args.rootdir, args.mountdir, args.nodelist)



    print '\nNothing left to do; exiting. :)'

ifs/scripts/util/__init__.py

0 → 100644
+0 −0

Empty file added.