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

fixed some proxy remove bugs. works now

parent 73a1a1e3

src/client/gkfs_functions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ gkfs_remove(const std::string& path) { 
    if(!md) {

        return -1;

    }

    int err{};

    int err = 0;

    if(gkfs::config::proxy::fwd_remove && CTX->use_proxy()) {

        err = gkfs::rpc::forward_remove_proxy(path);

    } else {

src/client/rpc/forward_metadata_proxy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ forward_stat_proxy(const std::string& path, string& attr) { 
            return out.err();



        attr = out.db_val();

        return 0;

    } catch(const std::exception& ex) {

        LOG(ERROR, "while getting rpc output");

        return EBUSY;
@@ -88,8 +89,7 @@ forward_remove_proxy(const std::string& path) { 
                           .at(0);

        LOG(DEBUG, "Got response success: {}", out.err());



        if(out.err())

            return out.err();

        return out.err() ? out.err() : 0;

    } catch(const std::exception& ex) {

        LOG(ERROR, "while getting rpc output");

        return EBUSY;

src/client/rpc/rpc_types.cpp

+1 −0
Original line number Diff line number Diff line
@@ -67,5 +67,6 @@ hermes::detail::register_user_request_types(uint32_t provider_id) { 
                provider_id);

        (void) registered_requests().add<gkfs::rpc::create_proxy>(provider_id);

        (void) registered_requests().add<gkfs::rpc::stat_proxy>(provider_id);

        (void) registered_requests().add<gkfs::rpc::remove_proxy>(provider_id);

    }

}

src/daemon/daemon.cpp

+4 −2
Original line number Diff line number Diff line
@@ -198,8 +198,10 @@ register_proxy_server_rpcs(margo_instance_id mid) { 
                   rpc_srv_create);

    MARGO_REGISTER(mid, gkfs::rpc::tag::stat, rpc_path_only_in_t,

                   rpc_stat_out_t, rpc_srv_stat);

    //    MARGO_REGISTER(mid, gkfs::rpc::tag::remove_metadata, rpc_rm_node_in_t,

    //    rpc_err_out_t, rpc_srv_remove);

    MARGO_REGISTER(mid, gkfs::rpc::tag::remove_metadata, rpc_rm_node_in_t,

                   rpc_rm_metadata_out_t, rpc_srv_remove_metadata);

    MARGO_REGISTER(mid, gkfs::rpc::tag::remove_data, rpc_rm_node_in_t,

                   rpc_err_out_t, rpc_srv_remove_data);

}

src/proxy/rpc/forward_metadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ remove_metadata(const std::string& path) { 
    } else {

        // something is wrong

        err = EBUSY;

        PROXY_DATA->log()->error("{}() sending rpc", __func__);

        PROXY_DATA->log()->error("{}() Critical error", __func__);

    }



    /* clean up resources consumed by this rpc */