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

Merge branch 'rnou/33-if-a-final-is-used-in-input-then-filenames-in-output-are-cut' into 'main' 

Resolve "If a final '/' is used in --input  then filenames in output are cut"

Closes #33 
Closes #34 
Release 0.3.3

See merge request !24
parents 5e2b97ce 6aacdb28

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cmake_minimum_required(VERSION 3.19) 


project(

  cargo

  VERSION 0.3.2

  VERSION 0.3.3

  LANGUAGES C CXX

)

spack/packages/cargo/package.py

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class Cargo(CMakePackage): 
    """A parallel data stager for malleable applications."""



    homepage = "https://storage.bsc.es/gitlab/hpc/cargo"

    url = "https://storage.bsc.es/gitlab/hpc/cargo/-/archive/v0.3.2/cargo-v0.3.2.tar.bz2"

    url = "https://storage.bsc.es/gitlab/hpc/cargo/-/archive/v0.3.3/cargo-v0.3.3.tar.bz2"

    git = "https://storage.bsc.es/gitlab/hpc/cargo.git"



    maintainers("alberto-miranda")
@@ -38,7 +38,7 @@ class Cargo(CMakePackage): 
    version("0.2.0", sha256="fd7fa31891b3961dcb376556ec5fa028bf512d96a7c688a160f9dade58dae36f")

    version("0.3.1", sha256="613485354e24c4b97cb6d045657569f94dc1d9bbb391b5a166f8d18b3595428b")

    version("0.3.2", sha256="ceb6bcb738a35fb41f40b7b1cdd8a806d99995a227980e8ced61dd90418e5960")



    version("0.3.3", sha256="ceb6bcb738a35fb41f40b7b1cdd8a806d99995a227980e8ced61dd90418e5960")

    # build variants

    variant('build_type',

            default='Release',
@@ -71,8 +71,8 @@ class Cargo(CMakePackage): 
    # specific dependencies

    # v0.1.0+

    depends_on("argobots@1.1", when='@0.1.0:')

    depends_on("mochi-margo@0.9.8", when='@0.1.0:')

    depends_on("mochi-thallium@0.10.1", when='@0.1.0:')

    depends_on("mochi-margo@0.14.1:", when='@0.1.0:')

    depends_on("mochi-thallium@0.11.3:", when='@0.1.0:')

    depends_on("boost@1.71 +program_options +mpi", when='@:0.1.0')

    depends_on("boost@1.71 +iostreams", when='@0.1.0: +tests')

src/master.cpp

+7 −2
Original line number Diff line number Diff line
@@ -267,9 +267,14 @@ master_server::transfer_datasets(const network::request& req, 
                s_new.path(f);

                // We need to get filename from the original root

                // path (d.path) plus the path from f, removing the

                // initial path p

                // initial path p (taking care of the trailing /)

                auto leading = p.size();

                if(leading>0 and p.back() == '/') {

                    leading--;

                }



                d_new.path(d.path() / std::filesystem::path(

                                              f.string().substr(p.size() + 1)));

                                              f.string().substr(leading + 1)));



                LOGGER_DEBUG("Expanded file {} -> {}", s_new.path(),

                             d_new.path());

src/posix_file/posix_file/file.hpp

+9 −0
Original line number Diff line number Diff line
@@ -189,7 +189,16 @@ public: 
                              static_cast<off_t>(len));



        if(ret == -1) {

            // Try an alternative to fallocate for beegfs

            if(errno == EOPNOTSUPP) {

                ret = ::posix_fallocate(m_handle.native(), offset,

                                        static_cast<off_t>(len));

                if (ret == -1) {

                    throw io_error("posix_file::file::posix_fallocate", errno);

                } else return;

            }

            throw io_error("posix_file::file::fallocate", errno);

            

        }

    }