Commit 62b4bd3b authored by rnou's avatar rnou Committed by Ramon Nou
Browse files

changes and merge

parent 9881b120

include/common/rpc/rpc_util.hpp

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ compress_bitset(const std::vector<uint8_t>& bytes); 
std::vector<uint8_t>

decompress_bitset(const std::string& compressedString);





} // namespace gkfs::rpc



#endif // GEKKOFS_COMMON_RPC_UTILS_HPP

src/client/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ if(GKFS_ENABLE_EC) 
         hermes

         fmt::fmt

         Threads::Threads

         Date::TZ

         GF_complete::GF_complete

         Jerasure::Jerasure

    )

src/client/gkfs_functions.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1030,11 +1030,10 @@ gkfs_do_write(gkfs::filemap::OpenFile& file, const char* buf, size_t count, 
    auto ret_write = gkfs::rpc::forward_write(*path, buf, offset, count, 0);

    err = ret_write.first;

    write_size = ret_write.second;



#ifdef GKFS_ENABLE_EC

    // Only compute Erasure codes if we do not have enabled the ondemand

    // environment variable

    if(CTX->get_ec_ondemand() == false) {

    if(CTX->get_ec_ondemand() == false and num_replicas>0) {

        auto res = gkfs_ecc_write(file, count, offset, write_size);

        if(res) {

            LOG(ERROR, "erasure code writing failed");

src/client/preload_context.cpp

+3 −3
Original line number Diff line number Diff line
@@ -547,8 +547,6 @@ PreloadContext::get_replicas() { 
    return replicas_;

}



<<<<<<< HEAD



const std::shared_ptr<messagepack::ClientMetrics>

PreloadContext::write_metrics() {

    return write_metrics_;
@@ -559,7 +557,6 @@ PreloadContext::read_metrics() { 
    return read_metrics_;

}



=======

void

PreloadContext::set_ec_ondemand(const bool ec_ondemand) {

    ec_ondemand_ = ec_ondemand;
@@ -571,6 +568,9 @@ PreloadContext::get_ec_ondemand() { 
}





<<<<<<< HEAD

>>>>>>> 801361a3 (Added ondemand calculation)

=======

>>>>>>> b1972d58 (changes and merge)

} // namespace preload

} // namespace gkfs

src/daemon/handler/srv_data.cpp

+2 −3
Original line number Diff line number Diff line
@@ -244,9 +244,8 @@ rpc_srv_write(hg_handle_t handle) { 
            GKFS_DATA->stats()->add_write(in.path, chnk_id_file);

        }



#endif

        GKFS_DATA->spdlogger()->error("{}() Processing at host {} -> {}",

                                      __func__, host_id, chnk_id_file);

        GKFS_DATA->spdlogger()->trace("{}() Processing at host {} -> {} / {}",

                                      __func__, host_id, chnk_id_file, in.path);

        chnk_ids_host[chnk_id_curr] =

                chnk_id_file; // save this id to host chunk list

        // offset case. Only relevant in the first iteration of the loop and if