diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/buildfile | 1 | ||||
| -rw-r--r-- | mod/ci-common.cxx | 17 | ||||
| -rw-r--r-- | mod/ci-common.hxx | 10 | ||||
| -rw-r--r-- | mod/mod-build-task.cxx | 42 | ||||
| -rw-r--r-- | mod/mod-ci.cxx | 4 |
5 files changed, 40 insertions, 34 deletions
diff --git a/mod/buildfile b/mod/buildfile index c3895dc..ff04ae5 100644 --- a/mod/buildfile +++ b/mod/buildfile @@ -39,6 +39,7 @@ mod{brep}: {hxx ixx txx cxx}{* -module-options -{$libu_src}} \ # the debugging of the notifications machinery. # cxx.poptions += -DBREP_CI_TENANT_SERVICE +cxx.poptions += -DBREP_CI_TENANT_SERVICE_UNLOADED libus{mod}: ../web/xhtml/libus{xhtml} libue{mod}: ../web/xhtml/libue{xhtml} diff --git a/mod/ci-common.cxx b/mod/ci-common.cxx index bd283f4..6ce47f2 100644 --- a/mod/ci-common.cxx +++ b/mod/ci-common.cxx @@ -539,7 +539,9 @@ namespace brep const basic_mark&, const basic_mark* trace, odb::core::database& db, - tenant_service&& service) const + tenant_service&& service, + duration notify_interval, + duration notify_delay) const { using namespace odb::core; @@ -562,13 +564,10 @@ namespace brep if (service.id.empty ()) service.id = request_id; - // Delay the first load attempt for 10 seconds (see mod-build-task.cxx for - // details). - // build_tenant t (move (request_id), move (service), - system_clock::now () - chrono::seconds (40 - 10)); - + system_clock::now () - notify_interval + notify_delay, + notify_interval); { assert (!transaction::has_current ()); @@ -644,7 +643,7 @@ namespace brep return nullopt; } - else if (!t->loaded_timestamp) + else if (!t->unloaded_timestamp) { error << "tenant " << t->id << " for service " << service.id << ' ' << service.type << " is already loaded"; @@ -652,7 +651,7 @@ namespace brep return nullopt; } - t->loaded_timestamp = nullopt; + t->unloaded_timestamp = nullopt; db.update (t); tr.commit (); @@ -712,7 +711,7 @@ namespace brep return; } - else if (!t->loaded_timestamp) + else if (!t->unloaded_timestamp) { error << "tenant " << t->id << " for service " << service.id << ' ' << service.type << " is already loaded"; diff --git a/mod/ci-common.hxx b/mod/ci-common.hxx index 45c959a..f332dc2 100644 --- a/mod/ci-common.hxx +++ b/mod/ci-common.hxx @@ -67,8 +67,10 @@ namespace brep // Create an unloaded CI request returning start_result::reference on // success and nullopt on an internal error. Such a request is not started - // until loaded with the load() function below. See also the - // build_unloaded() tenant services notification. + // until loaded with the load() function below. Configure the time + // interval between the build_unloaded() notifications for the being + // created tenant and set the initial delay for the first notification. + // See also the build_unloaded() tenant services notification. // // Note: should be called out of the database transaction. // @@ -77,7 +79,9 @@ namespace brep const basic_mark& warn, const basic_mark* trace, odb::core::database&, - tenant_service&&) const; + tenant_service&&, + duration notify_interval, + duration notify_delay) const; // Load (and start) previously created (as unloaded) CI request. Similarly // to the start() function, return nullopt on an internal error. diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx index 0752603..6be77f6 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -407,19 +407,6 @@ handle (request& rq, response& rs) // connection_ptr conn (build_db_->connection ()); - timestamp now (system_clock::now ()); - - auto expiration = [&now] (size_t timeout) -> timestamp - { - return now - chrono::seconds (timeout); - }; - - auto expiration_ns = [&expiration] (size_t timeout) -> uint64_t - { - return chrono::duration_cast<chrono::nanoseconds> ( - expiration (timeout).time_since_epoch ()).count (); - }; - // Perform some housekeeping first. // // Notify a tenant-associated third-party service about the unloaded CI @@ -433,16 +420,16 @@ handle (request& rq, response& rs) using query = query<build_tenant>; // Pick the unloaded tenant with the earliest loaded timestamp, skipping - // those whose timestamp is less than 40 seconds ago. - // - // NOTE: don't forget to update ci_start::create() if changing the timeout - // here. + // those which were already picked recently. // shared_ptr<build_tenant> t ( build_db_->query_one<build_tenant> ( - (query::loaded_timestamp <= expiration_ns (40) && - !query::archived) + - "ORDER BY" + query::loaded_timestamp + + (!query::archived && + query::unloaded_timestamp.is_not_null () && + (query::unloaded_timestamp + + "<= EXTRACT (EPOCH FROM NOW()) * 1000000000 - " + + query::unloaded_notify_interval)) + + "ORDER BY" + query::unloaded_timestamp + "LIMIT 1")); if (t != nullptr && t->service) @@ -461,7 +448,7 @@ handle (request& rq, response& rs) // set the package tenant's loaded timestamp to the current time to // prevent the notifications race. // - t->loaded_timestamp = system_clock::now (); + t->unloaded_timestamp = system_clock::now (); build_db_->update (t); } } @@ -610,6 +597,19 @@ handle (request& rq, response& rs) // Calculate the build/rebuild (building/built state) and the `queued` // notifications expiration time for package configurations. // + timestamp now (system_clock::now ()); + + auto expiration = [&now] (size_t timeout) -> timestamp + { + return now - chrono::seconds (timeout); + }; + + auto expiration_ns = [&expiration] (size_t timeout) -> uint64_t + { + return chrono::duration_cast<chrono::nanoseconds> ( + expiration (timeout).time_since_epoch ()).count (); + }; + uint64_t normal_result_expiration_ns ( expiration_ns (options_->build_result_timeout ())); diff --git a/mod/mod-ci.cxx b/mod/mod-ci.cxx index 18e38fc..0045002 100644 --- a/mod/mod-ci.cxx +++ b/mod/mod-ci.cxx @@ -389,7 +389,9 @@ handle (request& rq, response& rs) warn, verb_ ? &trace : nullptr, *build_db_, - tenant_service ("", "ci", rl.string ()))) + tenant_service ("", "ci", rl.string ()), + chrono::seconds (40), + chrono::seconds (10))) { string msg ("unloaded CI request is created: " + options_->host () + tenant_dir (root, *ref).string ()); |