Commit f5717825 authored by AdamSimpson's avatar AdamSimpson
Browse files

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

parents 8f410e9a 1a24c6f4

BuilderQueue/src/BuilderQueue.cpp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void BuilderQueue::tick(asio::yield_context yield) { 
    }



    // Request new builders if slots are open

    // Care must be taken as all_builders may include the the pending request before it's returned(open_slots, open_available_slots may be negative)

    int open_slots = max_builders - all_builders.size() - pending_requests;

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

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

Scripts/ProvisionBuilder

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ rm -rf /cmake-3.9.5-Linux-x86_64 
cd /

wget https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz

tar xf boost_1_65_1.tar.gz

cd boost_1_65_1git branch --set-upstream-to origin/master master

cd boost_1_65_1

./bootstrap.sh --with-libraries=filesystem,regex,system,coroutine,serialization,log,thread

./b2 install || :

rm -rf /boost_1_65_1

BuilderQueue/include/ReservationRequest.h

+1 −1

File changed.

Contains only whitespace changes.