Commit f35451a5 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'feat/fuse-client-metrics' into 'master' 

feat(fuse): add client-side metrics via MessagePack/ZeroMQ

- Add GKFS_ENABLE_CLIENT_METRICS to fuse_client and gkfs_user_lib targets
  - Instrument read/write handlers with add_event() (skip on error to avoid heap corruption)
  - Call init_metrics() on startup and flush on shutdown
  - Same env vars as intercept client: LIBGKFS_ENABLE_METRICS, LIBGKFS_METRICS_IP_PORT, etc.
  - Closes #387

Closes #387

See merge request !303
parents f4006c8d 7940908a

src/client/CMakeLists.txt

+9 −2
Original line number Diff line number Diff line
@@ -133,11 +133,19 @@ target_include_directories(fuse_client 
    PRIVATE

    ${FUSE3_INCLUDE_DIRS}

    )

if (GKFS_ENABLE_CLIENT_METRICS)

    target_link_libraries(fuse_client PRIVATE msgpack_util)

    target_compile_definitions(fuse_client PUBLIC GKFS_ENABLE_CLIENT_METRICS)

endif ()

endif()



if (GKFS_BUILD_USER_LIB)

target_compile_definitions(gkfs_user_lib PUBLIC BYPASS_SYSCALL ENABLE_USER)

target_link_options(gkfs_user_lib PRIVATE -z noexecstack)

if (GKFS_ENABLE_CLIENT_METRICS)

    target_link_libraries(gkfs_user_lib PRIVATE msgpack_util)

    target_compile_definitions(gkfs_user_lib PUBLIC GKFS_ENABLE_CLIENT_METRICS)

endif ()

endif()



if (GKFS_BUILD_LIBC_INTERCEPTION)
@@ -161,7 +169,7 @@ target_link_libraries( 
    Syscall_intercept::Syscall_intercept

    Microsoft.GSL::GSL

)

# Enable MSGPack metrics for intercept only

# Enable MSGPack metrics 

if (GKFS_ENABLE_CLIENT_METRICS)

    target_link_libraries(

        gkfs_intercept
@@ -193,7 +201,6 @@ target_link_libraries( 
    Threads::Threads

    Microsoft.GSL::GSL

)

# Enable MSGPack metrics for intercept only

if (GKFS_ENABLE_CLIENT_METRICS)

    target_link_libraries(

        gkfs_libc_intercept

src/client/fuse/fuse_client.cpp

+34 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
*/



#include <client/fuse/fuse_client.hpp>

#ifdef GKFS_ENABLE_CLIENT_METRICS

#include <common/msgpack_util.hpp>

#endif



static struct fuse_lowlevel_ops ll_ops;

struct InodeShard {
@@ -467,7 +470,14 @@ read_handler(fuse_req_t req, fuse_ino_t ino, size_t size, off_t off, 


    // Allocate buffer without zero-initialization for performance

    auto buf = std::make_unique<char[]>(size);

#ifdef GKFS_ENABLE_CLIENT_METRICS

    auto start_t = std::chrono::high_resolution_clock::now();

    int rc = gkfs::syscall::gkfs_pread(fi->fh, buf.get(), size, off);

    if(rc > 0)

        CTX->read_metrics()->add_event(rc, start_t);

#else

    int rc = gkfs::syscall::gkfs_pread(fi->fh, buf.get(), size, off);

#endif

    if(rc < 0) {

        LOG(DEBUG, "read fail");

        fuse_reply_err(req, errno);
@@ -487,7 +497,14 @@ write_handler(fuse_req_t req, fuse_ino_t ino, const char* buf, size_t size, 
            return;

        }

    }

#ifdef GKFS_ENABLE_CLIENT_METRICS

    auto start_t = std::chrono::high_resolution_clock::now();

    int rc = gkfs::syscall::gkfs_pwrite(fi->fh, buf, size, off);

    if(rc > 0)

        CTX->write_metrics()->add_event(rc, start_t);

#else

    int rc = gkfs::syscall::gkfs_pwrite(fi->fh, buf, size, off);

#endif

    if(rc < 0) {

        LOG(DEBUG, "write fail");

        fuse_reply_err(req, errno);
@@ -1405,6 +1422,13 @@ main(int argc, char* argv[]) { 
    ud.mountpoint = strdup(opts.mountpoint);

    init_gekkofs();



#ifdef GKFS_ENABLE_CLIENT_METRICS

    if(!CTX->init_metrics()) {

        fprintf(stderr,

                "FUSE client failed to initialize client metrics. Exit.\n");

        return 1;

    }

#endif



    se = fuse_session_new(&args, &ll_ops, sizeof(ll_ops), &ud);

    if(se == nullptr) {
@@ -1451,5 +1475,15 @@ main(int argc, char* argv[]) { 
    }



    fuse_session_unmount(se);



#ifdef GKFS_ENABLE_CLIENT_METRICS

    LOG(INFO, "Flushing final metrics...");

    CTX->write_metrics()->flush_msgpack();

    CTX->read_metrics()->flush_msgpack();

    LOG(INFO, "Metrics flushed. Total flush operations: {}",

        CTX->write_metrics()->flush_count());

    CTX->destroy_metrics();

#endif



    return ret < 0 ? 1 : 0;

}

src/client/gkfs_metadata.cpp

+43 −42
Original line number Diff line number Diff line
@@ -610,24 +610,26 @@ gkfs_rename(const string& old_path, const string& new_path) { 
            }

            return 0;

        }

        errno = EPERM;

        // Destination exists: remove it first (POSIX rename must atomically

        // replace destination)

        auto is_dir_new = S_ISDIR(md_new->mode());

        auto rm_err = gkfs::rpc::forward_remove(

                new_path, is_dir_new, CTX->get_replicas(), md_new->size());

        if(rm_err) {

            errno = rm_err;

            return -1;

    } else {



        }

    }



    if(!md_old.value().target_path().empty()) {





        // the file is a renamed one, we need to get the metadata of the

        // original file. (There will be only one level)



        original_path = md_old.value().target_path();

        if(!S_ISLNK(md_old->mode())) {

            md_old = gkfs::utils::get_metadata(original_path, false);



            if(!md_old) {

                    fprintf(stderr,

                            "GKFS_RENAME: md_old missing intermediate %d\n",

                fprintf(stderr, "GKFS_RENAME: md_old missing intermediate %d\n",

                        errno);

                return -1;

            }
@@ -656,7 +658,6 @@ gkfs_rename(const string& old_path, const string& new_path) { 
                errno);

        return -1;

    }

    }

    fprintf(stderr, "GKFS_RENAME: success returning 0\n");

    return 0;

}