Skip to content
Snippets Groups Projects
Commit 588e53dd authored by Millian Poquet's avatar Millian Poquet
Browse files

Merge branch 'release/v1.2.1' into releases

parents f3904c26 a526964b
Branches
Tags v1.2.1
No related merge requests found
...@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning][semver]. ...@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning][semver].
[//]: ========================================================================= [//]: =========================================================================
## [Unreleased] ## [Unreleased]
[//]: =========================================================================
## [1.2.1] - 2018-07-03 - For [Batsim v2.0.0][Batsim v2.0.0]
### Fixed
- The `sleeper` algorithm continued to send requests when the simulation was
finished, which should now be fixed.
- The `easy_bf_fast` algorithm rejected jobs that requested all the machines
if they could not be executed directly after being submitted
([issue 6](https://gitlab.inria.fr/batsim/batsched/issues/6)).
### Changed
- The `submitter` algorithm now also sets metadata for usual jobs.
[//]: ========================================================================= [//]: =========================================================================
## [1.2.0] - 2018-04-09 - For [Batsim v2.0.0][Batsim v2.0.0] ## [1.2.0] - 2018-04-09 - For [Batsim v2.0.0][Batsim v2.0.0]
### Added ### Added
...@@ -61,6 +73,7 @@ Initial release. ...@@ -61,6 +73,7 @@ Initial release.
[Batsim v2.0.0]: https://github.com/oar-team/batsim/blob/master/doc/changelog.md#200---2018-02-20 [Batsim v2.0.0]: https://github.com/oar-team/batsim/blob/master/doc/changelog.md#200---2018-02-20
[Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.0...master [Unreleased]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.1...master
[1.2.1]: https://gitlab.inria.fr/batsim/batsched/compare/v1.2.0...v1.2.1
[1.2.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.1.0...v1.2.0 [1.2.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.1.0...v1.2.0
[1.1.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.0.0...v1.1.0 [1.1.0]: https://gitlab.inria.fr/batsim/batsched/compare/v1.0.0...v1.1.0
...@@ -96,7 +96,7 @@ endif() ...@@ -96,7 +96,7 @@ endif()
#################### ####################
# Batsched version # # Batsched version #
#################### ####################
set(default_batsched_version "v1.2.0") set(default_batsched_version "v1.2.1")
include(GetGitRevisionDescription) include(GetGitRevisionDescription)
git_describe(batsched_version) git_describe(batsched_version)
message(STATUS "Batsched version from git: ${batsched_version}") message(STATUS "Batsched version from git: ${batsched_version}")
......
...@@ -200,7 +200,7 @@ void EasyBackfillingFast::make_decisions(double date, ...@@ -200,7 +200,7 @@ void EasyBackfillingFast::make_decisions(double date,
// The job is too big to fit now. // The job is too big to fit now.
// Is the job valid on this platform? // Is the job valid on this platform?
if (new_job->nb_requested_resources >= _nb_machines) if (new_job->nb_requested_resources > _nb_machines)
{ {
_decision->add_reject_job(new_job_id, date); _decision->add_reject_job(new_job_id, date);
} }
......
...@@ -49,7 +49,7 @@ void EnergyWatcher::make_decisions(double date, ...@@ -49,7 +49,7 @@ void EnergyWatcher::make_decisions(double date,
if (_consumed_joules_updated_recently) if (_consumed_joules_updated_recently)
{ {
PPK_ASSERT_ERROR(_consumed_joules >= _previous_energy, PPK_ASSERT_ERROR(_consumed_joules - _previous_energy >= -1e-6,
"Energy consumption inconsistency: it should be non-decreasing. " "Energy consumption inconsistency: it should be non-decreasing. "
"Received %g but previous value is %g.", "Received %g but previous value is %g.",
_consumed_joules, _previous_energy); _consumed_joules, _previous_energy);
......
...@@ -40,6 +40,8 @@ void Sleeper::on_simulation_start(double date, const rapidjson::Value &batsim_co ...@@ -40,6 +40,8 @@ void Sleeper::on_simulation_start(double date, const rapidjson::Value &batsim_co
void Sleeper::on_simulation_end(double date) void Sleeper::on_simulation_end(double date)
{ {
(void) date; (void) date;
simulation_finished = true;
} }
void Sleeper::make_decisions(double date, SortableJobOrder::UpdateInformation *update_info, SortableJobOrder::CompareInformation *compare_info) void Sleeper::make_decisions(double date, SortableJobOrder::UpdateInformation *update_info, SortableJobOrder::CompareInformation *compare_info)
...@@ -175,7 +177,7 @@ void Sleeper::make_decisions(double date, SortableJobOrder::UpdateInformation *u ...@@ -175,7 +177,7 @@ void Sleeper::make_decisions(double date, SortableJobOrder::UpdateInformation *u
} }
} }
} }
else else if (!simulation_finished)
{ {
// There are no jobs to compute at the moment. // There are no jobs to compute at the moment.
......
...@@ -36,4 +36,5 @@ private: ...@@ -36,4 +36,5 @@ private:
int compute_pstate; int compute_pstate;
int sleep_pstate; int sleep_pstate;
bool simulation_finished = false;
}; };
...@@ -98,6 +98,13 @@ void Submitter::make_decisions(double date, ...@@ -98,6 +98,13 @@ void Submitter::make_decisions(double date,
{ {
const Job * new_job = (*_workload)[new_job_id]; const Job * new_job = (*_workload)[new_job_id];
if (set_job_metadata)
{
_decision->add_set_job_metadata(new_job_id,
"just some metadata for job " + new_job_id,
date);
}
if (new_job->nb_requested_resources > _nb_machines) if (new_job->nb_requested_resources > _nb_machines)
_decision->add_reject_job(new_job_id, date); _decision->add_reject_job(new_job_id, date);
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment