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

Merge branch '88-alya-create-a-new-data-distributor' of... 

Merge branch '88-alya-create-a-new-data-distributor' of https://storage.bsc.es/gitlab/hpc/gekkofs into 88-alya-create-a-new-data-distributor

Conflicts:
	include/global/rpc/distributor.hpp
	src/client/preload.cpp
parents 8a1efd80 e319a5ca

src/client/preload.cpp

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ void init_ld_environment_() { 
    auto forwarder_dist = std::make_shared<gkfs::rpc::ForwarderDistributor>(CTX->fwd_host_id(), CTX->hosts().size());

    CTX->distributor(forwarder_dist);

#else



#ifdef USE_GUIDED

    auto distributor = std::make_shared<gkfs::rpc::GuidedDistributor>(CTX->local_host_id(), CTX->hosts().size());

#else
@@ -136,6 +135,7 @@ void init_ld_environment_() { 
    CTX->distributor(distributor);

#endif 

  



    LOG(INFO, "Retrieving file system configuration...");



    if (!gkfs::rpc::forward_get_fs_config()) {