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

fix directory

parent 7271647e

src/daemon/backend/metadata/rocksdb_backend.cpp

+17 −0
Original line number Diff line number Diff line
@@ -357,6 +357,12 @@ RocksDBBackend::get_dirents_impl(const std::string& dir) const { 
            continue;

        }

#endif // HAS_RENAME



        // Filter out inline data keys

        if(name.size() >= 7 && name.substr(name.size() - 7) == "#inline") {

            continue;

        }



        auto is_dir = S_ISDIR(md.mode());



        entries.emplace_back(std::move(name), is_dir);
@@ -407,6 +413,11 @@ RocksDBBackend::get_dirents_extended_impl(const std::string& dir) const { 
            continue;

        }

#endif // HAS_RENAME

        // Filter out inline data keys

        if(name.size() >= 7 && name.substr(name.size() - 7) == "#inline") {

            continue;

        }



        auto is_dir = S_ISDIR(md.mode());



        entries.emplace_back(std::forward_as_tuple(std::move(name), is_dir,
@@ -452,6 +463,12 @@ RocksDBBackend::get_all_dirents_extended_impl(const std::string& dir) const { 
            continue;

        }

#endif // HAS_RENAME



        // Filter out inline data keys

        if(name.size() >= 7 && name.substr(name.size() - 7) == "#inline") {

            continue;

        }



        auto is_dir = S_ISDIR(md.mode());



        entries.emplace_back(std::forward_as_tuple(std::move(name), is_dir,

src/daemon/handler/srv_metadata.cpp

+6 −0
Original line number Diff line number Diff line
@@ -737,7 +737,13 @@ rpc_srv_get_dirents(hg_handle_t handle) { 
    }



    // Respond

<<<<<<< HEAD

    if(gkfs::config::rpc::use_dirents_compression) {

||||||| parent of 59cea6f7 (fix directory)

    out.dirents_size = transfer_size;

=======

    if (gkfs::config::rpc::use_dirents_compression) {

>>>>>>> 59cea6f7 (fix directory)

        out.dirents_size = transfer_size;

    } else {

        out.dirents_size = entries.size();