Unverified Commit fe26a8fe authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Remove old project name occurrences 

Get rid of all the occurrences of old project name "adafs" from output
strings and documentation
parent fa130b47

scripts/compile_dep.sh

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ help_msg() { 


	usage_short

    echo "

This script compiles all ADA-FS dependencies (excluding the fs itself)

This script compiles all GekkoFS dependencies (excluding the fs itself)



positional arguments:

    source_path 	path to the cloned dependencies path from clone_dep.sh
@@ -213,9 +213,9 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then 
    prepare_build_dir ${CURR}

    cd ${CURR}

    # patch hanging issue

    echo "########## ADA-FS injection: Applying cci hanging patch"

    echo "########## Patch injection: Applying cci hanging patch"

    git apply ${PATCH_DIR}/cci_hang_final.patch

    echo "########## ADA-FS injection: Disabling cci debug mode/devel mode entirely"

    echo "########## Patch injection: Disabling cci debug mode/devel mode entirely"

    git apply ${PATCH_DIR}/cci_remove_devel_mode.patch

    ./autogen.pl

    cd ${CURR}/build
@@ -225,7 +225,7 @@ else 
    ../configure --prefix=${INSTALL} LIBS="-lpthread"

fi



    echo "########## ADA-FS injection: Replacing any remaining CFLAGS with '-g -O2' that are added by cci although debug mode is disabled with '-O3'"

    echo "########## Patch injection: Replacing any remaining CFLAGS with '-g -O2' that are added by cci although debug mode is disabled with '-O3'"

    find . -type f -exec sed -i 's/-g -O2/-O3/g' {} \;

    make -j${CORES}

    make install

scripts/dl_dep.sh

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ help_msg() { 


        usage_short

    echo "

This script gets all ADA-FS dependency sources (excluding the fs itself)

This script gets all GekkoFS dependency sources (excluding the fs itself)



positional arguments:

        source_path              path where the dependency downloads are put

scripts/shutdown_adafs.py

+5 −5
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ def check_dependencies(): 




def shutdown_system(daemon_pid_path, nodelist, sigkill):

    """Shuts down ADAFS on specified nodes.

    """Shuts down GekkoFS on specified nodes.



    Args:

        daemon_pid_path (str): Path to daemon pid file

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

        nodelist (str): Comma-separated list of nodes where daemons need to be launched

        sigkill (bool): If true force kills daemons

    """

    global PSSH_PATH
@@ -126,7 +126,7 @@ def shutdown_system(daemon_pid_path, nodelist, sigkill): 


if __name__ == "__main__":

    # Init parser

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

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

                                     formatter_class=argparse.RawTextHelpFormatter)

    # positional arguments

    parser.add_argument('daemonpidpath', type=str,
@@ -137,9 +137,9 @@ if __name__ == "__main__": 


    # optional arguments

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

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

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

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

                        help='Force kill adafs_daemons')

                        help='Force kill 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}')

    parser.add_argument('-J', '--jobid', metavar='<JOBID>', type=str, default='',

scripts/startup_adafs.py

+10 −10
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ def check_dependencies(): 




def init_system(daemon_path, rootdir, metadir, mountdir, nodelist, cleanroot, numactl):

    """Initializes ADAFS on specified nodes.

    """Initializes GekkoFS on specified nodes.



    Args:

        daemon_path (str): Path to daemon executable

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

        metadir (str): Path to metadata directory where metadata is stored

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

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

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

        nodelist (str): Comma-separated list of nodes where daemons need to be launched

        cleanroot (bool): if True, root and metadir is cleaned before daemon init

        numactl (str): numactl arguments for daemon init

    """
@@ -124,7 +124,7 @@ def init_system(daemon_path, rootdir, metadir, mountdir, nodelist, cleanroot, nu 
        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!')

            print('[ERR] with pssh. Aborting. Please run shutdown_adafs.py to shut down orphan daemons!')

            exit(1)



    if not PRETEND:
@@ -133,7 +133,7 @@ def init_system(daemon_path, rootdir, metadir, mountdir, nodelist, cleanroot, nu 
            print('{}\r'.format(WAITTIME - i)),

            time.sleep(1)



    # Check adafs logs for errors

    # Check logs for errors

    cmd_chk_str = '%s "head -5 /tmp/gkfs_daemon.log"' % pssh

    if PRETEND:

        print('Pretending: {}'.format(cmd_chk_str))
@@ -160,13 +160,13 @@ def init_system(daemon_path, rootdir, metadir, mountdir, nodelist, cleanroot, nu 
        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!')

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

            exit(1)





if __name__ == "__main__":

    # Init parser

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

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

                                     formatter_class=argparse.RawTextHelpFormatter)

    # positional arguments

    parser.add_argument('daemonpath', type=str,
@@ -184,15 +184,15 @@ or a path to a nodefile (one node per line)''') 
                        help='''Path to separate metadir directory where metadata is stored. 

If not set, rootdir will be used instead.''')

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

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

                        help='Output 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}')

    parser.add_argument('-J', '--jobid', metavar='<JOBID>', type=str, default='',

                        help='Jobid for cluster batch system. Used for a unique hostfile used for pssh.')

    parser.add_argument('-c', '--cleanroot', action='store_true',

                        help='Removes contents of root and metadata directory before starting ADA-FS Daemon. Be careful!')

                        help='Removes contents of root and metadata directory before starting daemon. Be careful!')

    parser.add_argument('-n', '--numactl', metavar='<numactl_args>', type=str, default='',

                        help='If adafs daemon should be pinned to certain cores, set numactl arguments here.')

                        help='If daemon should be pinned to certain cores, set numactl arguments here.')

    parser.add_argument('-H', '--pssh_hostfile', metavar='<pssh_hostfile>', type=str, default='/tmp/hostfile_pssh',

                        help='''This script creates a hostfile to pass to MPI. This variable defines the path. 

Defaults to /tmp/hostfile_pssh''')

src/client/open_file_map.cpp

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int OpenFileMap::dup2(const int oldfd, const int newfd) { 
}



/**

 * Generate new file descriptor index to be used as an fd within one process in ADA-FS

 * Generate new file descriptor index to be used as an fd within one process

 * @return fd_idx

 */

int OpenFileMap::generate_fd_idx() {