Commit 1574362c authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Merge branch 'cleanup_managment_rpc' into 'master' 

Cleanup RPCs

See merge request zdvresearch_bsc/adafs!104
parents 1cb962cf 5b419982

ifs/include/daemon/adafs_ops/metadentry.hpp

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#include <daemon/adafs_daemon.hpp>

#include <global/metadata.hpp>

#include <preload/preload_util.hpp>



int create_node(const std::string& path, const uid_t uid, const gid_t gid, mode_t mode);

ifs/include/daemon/classes/rpc_data.hpp

+0 −5
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ private: 


    // Margo IDs. They can also be used to retrieve the Mercury classes and contexts that were created at init time

    margo_instance_id server_rpc_mid_;

    margo_instance_id server_ipc_mid_;



    // Argobots I/O pools and execution streams

    ABT_pool io_pool_;
@@ -35,10 +34,6 @@ public: 


    void server_rpc_mid(margo_instance* server_rpc_mid);



    margo_instance* server_ipc_mid();



    void server_ipc_mid(margo_instance* server_ipc_mid);



    ABT_pool io_pool() const;



    void io_pool(ABT_pool io_pool);

ifs/include/daemon/handler/rpc_defs.hpp

+1 −3
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ extern "C" { 


/* visible API for RPC operations */



DECLARE_MARGO_RPC_HANDLER(rpc_minimal)



DECLARE_MARGO_RPC_HANDLER(ipc_srv_fs_config)

DECLARE_MARGO_RPC_HANDLER(rpc_srv_fs_config)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_mk_node)

ifs/include/global/configure.hpp

+1 −5
Original line number Diff line number Diff line
@@ -55,16 +55,12 @@ 
 * The value is directly mapped to created Argobots xstreams, controlled in a single pool with ABT_snoozer scheduler

 */

#define DAEMON_IO_XSTREAMS 8

// Number of threads used for RPC and IPC handlers at the daemon

// Number of threads used for RPC handlers at the daemon

#define DAEMON_RPC_HANDLER_XSTREAMS 8

#define RPC_PORT 4433

#define RPC_TRIES 3

// rpc timeout to try again in milliseconds

#define RPC_TIMEOUT 180000

// enables timing of sending rpcs

//#define MARGO_FORWARD_TIMER

// sets the threshold in milliseconds when a log entry should be created

#define MARGO_FORWARD_TIMER_THRESHOLD 1000



//size of preallocated buffer to hold directory entries in rpc call

#define RPC_DIRENTS_BUFF_SIZE (8 * 1024 * 1024) // 8 mega

ifs/include/global/global_defs.hpp

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 


// These constexpr set the RPC's identity and which handler the receiver end should use

namespace hg_tag {

    constexpr auto fs_config = "ipc_srv_fs_config";

    constexpr auto minimal = "rpc_minimal";

    constexpr auto fs_config = "rpc_srv_fs_config";

    constexpr auto create = "rpc_srv_mk_node";

    constexpr auto access = "rpc_srv_access";

    constexpr auto stat = "rpc_srv_stat";