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

Removed transfer_update RPC, 

cargo workflow finished
Added support for gekkofs: etc types
parent 8d29b922

examples/cxx/ADM_transfer_update.cpp

+15 −2
Original line number Original line Diff line number Diff line
@@ -75,6 +75,19 @@ main(int argc, char* argv[]) { 
                server, name, scord::adhoc_storage::type::gekkofs,

                server, name, scord::adhoc_storage::type::gekkofs,

                adhoc_storage_ctx, adhoc_resources);

                adhoc_storage_ctx, adhoc_resources);







        std::vector <scord::dataset> ins;

        std::vector <scord::dataset> outs;



        scord::dataset in1;

        scord::dataset out1;



        in1 = scord::dataset("lustre:/tmp/input-dataset-1");

        out1 = scord::dataset("gekkofs:/tmp/input-dataset-cp");

 

        ins.push_back (in1);

        outs.push_back (out1);

        

        scord::job::requirements reqs(inputs, outputs, expected_outputs,

        scord::job::requirements reqs(inputs, outputs, expected_outputs,

                                      adhoc_storage);

                                      adhoc_storage);
@@ -82,9 +95,9 @@ main(int argc, char* argv[]) { 
                server, scord::job::resources{job_nodes}, reqs, 0);

                server, scord::job::resources{job_nodes}, reqs, 0);





        const auto transfer = scord::transfer_datasets(

        const auto transfer = scord::transfer_datasets(

                server, job, sources, targets, qos_limits, mapping);

                server, job, ins, outs, qos_limits, mapping);





        scord::transfer_update(server, transfer.id(), 10.0f);

        // scord::transfer_update(server, transfer.id(), 10.0f);

        

        

        fmt::print(stdout, "ADM_transfer_update() remote procedure completed "

        fmt::print(stdout, "ADM_transfer_update() remote procedure completed "

                           "successfully\n");

                           "successfully\n");

examples/cxx/CMakeLists.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ list(APPEND cxx_examples_with_controller 
  ADM_deploy_adhoc_storage ADM_terminate_adhoc_storage

  ADM_deploy_adhoc_storage ADM_terminate_adhoc_storage

  # transfers

  # transfers

  ADM_transfer_datasets ADM_get_transfer_priority ADM_set_transfer_priority

  ADM_transfer_datasets ADM_get_transfer_priority ADM_set_transfer_priority

  ADM_cancel_transfer ADM_get_pending_transfers ADM_transfer_update

  ADM_cancel_transfer ADM_get_pending_transfers

  # qos

  # qos

  ADM_set_qos_constraints ADM_get_qos_constraints

  ADM_set_qos_constraints ADM_get_qos_constraints

  # data operations

  # data operations

spack/packages/scord/package.py

+5 −4
Original line number Original line Diff line number Diff line
@@ -83,18 +83,19 @@ class Scord(CMakePackage): 
    # specific dependencies

    # specific dependencies

    # v0.2.0+

    # v0.2.0+

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

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

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

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

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

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

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

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

    depends_on("redis-plus-plus@1.3.3:", when='@0.2.0:')

    depends_on("redis-plus-plus@1.3.3:", when='@0.2.0:')

    depends_on("cargo@0.3.2:", when='@0.3.1:')





    with when("@0.2.0: +ofi"):

    with when("@0.2.0: +ofi"):

        depends_on("libfabric@1.14.0 fabrics=sockets,tcp,rxm")

        depends_on("libfabric@1.14.0 fabrics=sockets,tcp,rxm")

        depends_on("mercury@2.1.0 +ofi")

        depends_on("mercury@2.1.0: +ofi")





    with when("@0.2.0: +ucx"):

    with when("@0.2.0: +ucx"):

        depends_on("ucx@1.12.0")

        depends_on("ucx@1.12.0")

        depends_on("mercury@2.1.0 +ucx")

        depends_on("mercury@2.1.0: +ucx")





    def cmake_args(self):

    def cmake_args(self):

        """Setup scord CMake arguments"""

        """Setup scord CMake arguments"""

src/common/net/server.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -391,6 +391,7 @@ server::teardown_and_exit() { 




void

void

server::shutdown() {

server::shutdown() {

    m_shutting_down = true;

    m_network_engine.finalize();

    m_network_engine.finalize();

}

}

src/common/net/server.hpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,7 @@ private: 




protected:

protected:

    thallium::engine m_network_engine;

    thallium::engine m_network_engine;

    std::atomic<bool> m_shutting_down;





private:

private:

    scord::utils::signal_listener m_signal_listener;

    scord::utils::signal_listener m_signal_listener;