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

fix bugs

parent 54dd5c7d

include/client/rpc/forward_malleability.hpp

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ forward_mutate_status(); 
int

forward_mutate_finalize();



int

forward_mutate_reload(const std::string& hosts_file);



int

forward_mutate_shutdown_removed(const std::string& hostfile);

include/common/common_defs.hpp

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ namespace malleable::rpc::tag { 
constexpr auto mutate_start = "rpc_srv_mutate_start";

constexpr auto mutate_status = "rpc_srv_mutate_status";

constexpr auto mutate_finalize = "rpc_srv_mutate_finalize";

constexpr auto mutate_reload = "rpc_srv_mutate_reload";

constexpr auto mutate_shutdown = "rpc_srv_mutate_shutdown";

// Migrate metadata (used by forward_metadata for RocksDB redistribution)

constexpr auto migrate_metadata = "rpc_srv_migrate_metadata";

include/common/rpc/rpc_types_thallium.hpp

+9 −0
Original line number Diff line number Diff line
@@ -458,6 +458,15 @@ struct rpc_mutate_start_in_t { 
    }

};



struct rpc_mutate_reload_in_t {

    std::string hosts_file;

    template <class Archive>

    void

    serialize(Archive& ar) {

        ar(hosts_file);

    }

};



struct rpc_migrate_metadata_in_t {

    std::string key;

    std::string value;

include/daemon/classes/fs_data.hpp

+17 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <functional> //std::hash

#include <string_view>

#include <memory>

#include <thallium.hpp>



/* Forward declarations */

namespace gkfs {
@@ -143,7 +144,10 @@ private: 


    bool expand_on_demand_active_ = false;

    unsigned int expand_on_demand_old_hosts_size_ = 0;

    uint64_t expand_on_demand_old_local_host_id_ =

            std::numeric_limits<uint64_t>::max();

    std::shared_ptr<gkfs::rpc::Distributor> expand_on_demand_old_distributor_;

    std::map<uint64_t, thallium::endpoint> expand_on_demand_old_rpc_endpoints_;



    std::shared_ptr<gkfs::malleable::MalleableManager> malleable_manager_;
@@ -171,6 +175,12 @@ public: 
    void

    expand_on_demand_old_hosts_size(unsigned int hosts_size);



    uint64_t

    expand_on_demand_old_local_host_id() const;



    void

    expand_on_demand_old_local_host_id(uint64_t host_id);



    std::shared_ptr<gkfs::rpc::Distributor>

    expand_on_demand_old_distributor() const;
@@ -178,6 +188,13 @@ public: 
    expand_on_demand_old_distributor(

            std::shared_ptr<gkfs::rpc::Distributor> distributor);



    const std::map<uint64_t, thallium::endpoint>&

    expand_on_demand_old_rpc_endpoints() const;



    void

    expand_on_demand_old_rpc_endpoints(

            std::map<uint64_t, thallium::endpoint> endpoints);



    // getter/setter



    const std::shared_ptr<spdlog::logger>&

include/daemon/handler/rpc_defs.hpp

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ rpc_srv_mutate_status(const tl::request& req); 
void

rpc_srv_mutate_finalize(const tl::request& req);



void

rpc_srv_mutate_reload(const tl::request& req,

                      const gkfs::rpc::rpc_mutate_reload_in_t& in);



void

rpc_srv_mutate_shutdown(const tl::request& req);