Commit a92582a5 authored by Jean Bez's avatar Jean Bez
Browse files

Merge the code with the latest updates

parent cbb7703a

src/daemon/CMakeLists.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ install(TARGETS gkfs_daemon 
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

)

)







if(GKFS_ENABLE_FORWARDING)

if(GKFS_ENABLE_FORWARDING)

    set(FWD_DAEMON_SRC

    set(FWD_DAEMON_SRC

        ../global/rpc/rpc_util.cpp

        ../global/rpc/rpc_util.cpp
@@ -71,10 +70,11 @@ if(GKFS_ENABLE_FORWARDING) 
        daemon.cpp

        daemon.cpp

        util.cpp

        util.cpp

        ops/metadentry.cpp

        ops/metadentry.cpp

        ops/data.cpp

        classes/fs_data.cpp

        classes/fs_data.cpp

        classes/rpc_data.cpp

        classes/rpc_data.cpp

        handler/srv_metadata.cpp

        handler/srv_data.cpp

        handler/srv_data.cpp

        handler/srv_metadata.cpp

        handler/srv_management.cpp

        handler/srv_management.cpp

        scheduler/agios.cpp

        scheduler/agios.cpp

        )

        )
@@ -89,6 +89,7 @@ if(GKFS_ENABLE_FORWARDING) 
        ../../include/daemon/daemon.hpp

        ../../include/daemon/daemon.hpp

        ../../include/daemon/util.hpp

        ../../include/daemon/util.hpp

        ../../include/daemon/scheduler/agios.hpp

        ../../include/daemon/scheduler/agios.hpp

        ../../include/daemon/ops/data.hpp

        ../../include/daemon/ops/metadentry.hpp

        ../../include/daemon/ops/metadentry.hpp

        ../../include/daemon/classes/fs_data.hpp

        ../../include/daemon/classes/fs_data.hpp

        ../../include/daemon/classes/rpc_data.hpp

        ../../include/daemon/classes/rpc_data.hpp

src/daemon/handler/srv_data.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -56,9 +56,9 @@ static hg_return_t rpc_srv_write(hg_handle_t handle) { 
    auto hgi = margo_get_info(handle);

    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_info_get_instance(hgi);

    auto bulk_size = margo_bulk_get_size(in.bulk_handle);

    auto bulk_size = margo_bulk_get_size(in.bulk_handle);



    GKFS_DATA->spdlogger()->debug(

    GKFS_DATA->spdlogger()->debug("{}() path: {}, size: {}, offset: {}", __func__,

            "{}() path: '{}' chunk_start '{}' chunk_end '{}' chunk_n '{}' total_chunk_size '{}' bulk_size: '{}' offset: '{}'",

                                  in.path, bulk_size, in.offset);

            __func__, in.path, in.chunk_start, in.chunk_end, in.chunk_n, in.total_chunk_size, bulk_size, in.offset);

    #ifdef GKFS_ENABLE_AGIOS

    #ifdef GKFS_ENABLE_AGIOS

    int *data;

    int *data;

    ABT_eventual eventual = ABT_EVENTUAL_NULL;

    ABT_eventual eventual = ABT_EVENTUAL_NULL;

tests/integration/conftest.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ def gkfs_daemon(test_workspace, request): 
    daemon.shutdown()

    daemon.shutdown()





@pytest.fixture

@pytest.fixture

def gkfs_client(test_workspace, request):

def gkfs_client(test_workspace):

    """

    """

    Sets up a gekkofs client environment so that

    Sets up a gekkofs client environment so that

    operations (system calls, library calls, ...) can

    operations (system calls, library calls, ...) can
@@ -102,7 +102,7 @@ def gkfs_client(test_workspace, request): 
    return Client(test_workspace)

    return Client(test_workspace)





@pytest.fixture

@pytest.fixture

def gkfs_shell(test_workspace, request):

def gkfs_shell(test_workspace):

    """

    """

    Sets up a gekkofs environment so that shell commands

    Sets up a gekkofs environment so that shell commands

    (stat, ls, mkdir, etc.) can be issued to a co-running daemon.

    (stat, ls, mkdir, etc.) can be issued to a co-running daemon.
@@ -131,7 +131,7 @@ def gkfwd_daemon_factory(test_workspace, request): 
    return FwdDaemonCreator(interface, test_workspace)

    return FwdDaemonCreator(interface, test_workspace)





@pytest.fixture

@pytest.fixture

def gkfwd_client_factory(test_workspace, request):

def gkfwd_client_factory(test_workspace):

    """

    """

    Sets up a gekkofs client environment so that

    Sets up a gekkofs client environment so that

    operations (system calls, library calls, ...) can

    operations (system calls, library calls, ...) can