Resolve "unlink (gkfs_remove) can delete directories"

Ramon Nourequested to merge
rnou/215-unlink-gkfs_remove-can-delete-directories into master

Closes #215 (closed)

Edited by Ramon Nou

Merge request reports

src/client/rpc/forward_metadata.cpp

+1 −1
Changes for src/client/rpc/forward_metadata.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ forward_get_dirents(const string& path) { 
        }

    }



    LOG(INFO,

    LOG(DEBUG,

        "{}() path '{}' send rpc_srv_get_dirents() rpc to '{}' targets. per_host_buff_size '{}' Waiting on reply next and deserialize",

        __func__, path, targets.size(), per_host_buff_size);

src/client/gkfs_functions.cpp

+7 −0
Changes for src/client/gkfs_functions.cpp: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -276,6 +276,13 @@ gkfs_remove(const std::string& path) { 
    if(!md) {

        return -1;

    }



    if(S_ISDIR(md->mode())) {

        LOG(ERROR, "Cannot remove directory '{}'", path);

        errno = EISDIR;

        return -1;

    }



    auto err = gkfs::rpc::forward_remove(path);

    if(err) {

        errno = err;

tests/integration/harness/gkfs.io/commands.hpp

+3 −0
Changes for tests/integration/harness/gkfs.io/commands.hpp: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -108,4 +108,7 @@ getcwd_validate_init(CLI::App& app); 
void

symlink_init(CLI::App& app);



void

unlink_init(CLI::App& app);



#endif // IO_COMMANDS_HPP

tests/integration/harness/gkfs.io/main.cpp

+1 −0
Changes for tests/integration/harness/gkfs.io/main.cpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ init_commands(CLI::App& app) { 
    chdir_init(app);

    getcwd_validate_init(app);

    symlink_init(app);

    unlink_init(app);

}

tests/integration/harness/gkfs.io/unlink.cpp

0 → 100644
+98 −0
Changes for tests/integration/harness/gkfs.io/unlink.cpp: 98 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/*

  Copyright 2018-2022, Barcelona Supercomputing Center (BSC), Spain

  Copyright 2015-2022, Johannes Gutenberg Universitaet Mainz, Germany



  This software was partially supported by the

  EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).



  This software was partially supported by the

  ADA-FS project under the SPPEXA project funded by the DFG.



  This file is part of GekkoFS.



  GekkoFS is free software: you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation, either version 3 of the License, or

  (at your option) any later version.



  GekkoFS is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  GNU General Public License for more details.



  You should have received a copy of the GNU General Public License

  along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.



  SPDX-License-Identifier: GPL-3.0-or-later

*/



/* C++ includes */

#include <CLI11/CLI11.hpp>

#include <nlohmann/json.hpp>

#include <memory>

#include <fmt/format.h>

#include <commands.hpp>

#include <reflection.hpp>

#include <serialize.hpp>

#include <binary_buffer.hpp>



/* C includes */

#include <unistd.h>



using json = nlohmann::json;



struct unlink_options {

    bool verbose{};

    std::string pathname;



    REFL_DECL_STRUCT(unlink_options, REFL_DECL_MEMBER(bool, verbose),

                     REFL_DECL_MEMBER(std::string, pathname));

};



struct unlink_output {

    int retval;

    int errnum;



    REFL_DECL_STRUCT(unlink_output, REFL_DECL_MEMBER(int, retval),

                     REFL_DECL_MEMBER(int, errnum));

};



void

to_json(json& record, const unlink_output& out) {

    record = serialize(out);

}



void

unlink_exec(const unlink_options& opts) {



    auto fd = ::unlink(opts.pathname.c_str());



    if(opts.verbose) {

        fmt::print("unlink(pathname=\"{}\") = {}, errno: {} [{}]\n",

                   opts.pathname, errno, ::strerror(errno));

        return;

    }



    json out = unlink_output{fd, errno};

    fmt::print("{}\n", out.dump(2));



    return;

}



void

unlink_init(CLI::App& app) {



    // Create the option and subcommand objects

    auto opts = std::make_shared<unlink_options>();

    auto* cmd = app.add_subcommand("unlink", "Execute the unlink() system call");



    // Add options to cmd, binding them to opts

    cmd->add_flag("-v,--verbose", opts->verbose,

                  "Produce human readable output");



    cmd->add_option("pathname", opts->pathname, "File name")

            ->required()

            ->type_name("");



    cmd->callback([opts]() { unlink_exec(*opts); });

}