Commit 11c985a8 authored by AdamSimpson's avatar AdamSimpson
Browse files

Merge branch 'master' of https://code.ornl.gov/olcf/ContainerBuilder

parents 9a9445ff 21c60787

BuilderQueue/src/BuilderQueue.cpp

+6 −5
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ void BuilderQueue::tick(asio::yield_context yield) { 
            // If the reservation is complete delete the builder

            if (reservation.complete()) {

                asio::spawn(io_service,

                            [&](asio::yield_context yield) {

                                OpenStackBuilder::destroy(reservation.builder.get(), io_service, yield);

                            [&](asio::yield_context destroy_yield) {

                                OpenStackBuilder::destroy(reservation.builder.get(), io_service, destroy_yield);

                                reservation.builder = boost::none;

                            });

            }
@@ -52,11 +52,12 @@ void BuilderQueue::tick(asio::yield_context yield) { 
    auto open_slots = max_builders - all_builders.size() - pending_requests;

    auto open_available_slots = max_available_builders - available_builders.size() - pending_requests;

    auto request_count = std::min(open_slots, open_available_slots);

    for (auto i=0; i < request_count; i++) {

    logger::write("Requesting " + std::to_string(request_count) + " builders");

    for (unsigned int i=0; i < request_count; i++) {

        pending_requests++;

        asio::spawn(io_service,

                    [&](asio::yield_context yield) {

                        OpenStackBuilder::request_create(io_service, yield);

                    [&](asio::yield_context request_yield) {

                        OpenStackBuilder::request_create(io_service, request_yield);

                        pending_requests--;

                    });

    }

Scripts/ProvisionBuilder

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ rm -rf /boost_1_65_1 


# Install ContainerBuilder

cd /

git clone https://github.com/AdamSimpson/ContainerBuilder.git

git clone https://code.ornl.gov/olcf/ContainerBuilder.git

cd ContainerBuilder

mkdir build && cd build

cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/local" ..

Scripts/ProvisionQueue

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ rm -rf /boost_1_65_1 


# Install ContainerBuilder

cd /

git clone https://github.com/AdamSimpson/ContainerBuilder.git

git clone https://code.ornl.gov/olcf/ContainerBuilder.git

cd ContainerBuilder

mkdir build && cd build

cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTAL_PREFIX="/usr/local" ..