Commit 06f3c598 authored by MOMMESSIN Clement's avatar MOMMESSIN Clement

Revert "Merge branch '74-add-no-more-jobs-in-workload-event' into 'master'"

This reverts merge request !6
parent 4ca75487
......@@ -134,7 +134,7 @@ centralized storage tier. The storage tier is represented by one node.
```json
{
"type": "msg_par_hg_pfs",
"type": "msg_par_hg_pfs"
"bytes_to_read": 10e5,
"bytes_to_write": 10e5,
"storage": "nfs"
......
......@@ -104,7 +104,6 @@ Constraints on the message format are defined here:
- [JOB_KILLED](#job_killed)
- [RESOURCE_STATE_CHANGED](#resource_state_changed)
- [REQUESTED_CALL](#requested_call)
- [NO_MORE_STATIC_SUBMITTERS](#no_more_static_submitters)
- Scheduler to Batsim
- [REJECT_JOB](#reject_job)
- [EXECUTE_JOB](#execute_job)
......@@ -609,20 +608,6 @@ This message is a response to the [CALL_ME_LATER](#call_me_later) message.
}
```
### NO_MORE_STATIC_SUBMITTERS
This message tells the scheduler that all jobs in the workload(s) have been submitted.
This is meaningful only if ``"scheduler_submission": {"enabled": true}`` is configured and tells the scheduler that Batsim is waiting for a ``submission_finished`` NOTIFY event.
- **data**: empty
- **example**:
```json
{
"timestamp": 23.0,
"type": "NO_MORE_STATIC_SUBMITTERS",
"data": {}
}
```
---
## Scheduler to Batsim events
......@@ -687,10 +672,10 @@ allocation itself, for example when some IO nodes are involved.
"job_id": "w12!45",
"alloc": "2-3",
"mapping": {"0": "0", "1": "0", "2": "1", "3": "1"}
},
}
"storage_mapping": {
"pfs": 2
},
}
"additional_io_job": {
"alloc": "2-3 5-6",
"profile_name": "my_io_job",
......
......@@ -47,26 +47,6 @@ void JsonProtocolWriter::append_requested_call(double date)
_events.PushBack(event, _alloc);
}
void JsonProtocolWriter::append_no_more_static_submitters(double date)
{
/*{
"timestamp":23.0,
"type": "NO_MORE_STATIC_SUBMITTERS",
"data": {}
} */
xbt_assert(date >= _last_date, "Date inconsistency");
_last_date = date;
_is_empty = false;
Value event(rapidjson::kObjectType);
event.AddMember("timestamp", Value().SetDouble(date), _alloc);
event.AddMember("type", Value().SetString("NO_MORE_STATIC_SUBMITTERS"), _alloc);
event.AddMember("data", Value().SetObject(), _alloc);
_events.PushBack(event, _alloc);
}
void JsonProtocolWriter::append_simulation_begins(Machines & machines,
Workloads & workloads,
const Document & configuration,
......@@ -1333,8 +1313,6 @@ void JsonProtocolReader::handle_submit_job(int event_number,
xbt_assert(context->submission_sched_enabled, "Invalid JSON message: dynamic job submission received but the option seems disabled...");
xbt_assert(!context->submission_sched_finished, "Invalid JSON message: dynamic job submission received but the option have been disabled (a submission_finished message have already been received)");
xbt_assert(data_object.IsObject(), "Invalid JSON message: the 'data' value of event %d (SUBMIT_JOB) should be an object", event_number);
xbt_assert(data_object.HasMember("job_id"), "Invalid JSON message: the 'data' value of event %d (SUBMIT_JOB) should have a 'job_id' key", event_number);
......
......@@ -172,12 +172,6 @@ public:
*/
virtual void append_requested_call(double date) = 0;
/**
* @brief Appends a NO_MORE_STATIC_SUBMITTERS message.
* @param date The event date. Must be greater than or equal to the previous event.
*/
virtual void append_no_more_static_submitters(double date) =0;
// Management functions
/**
* @brief Clears inner content. Should called directly after generate_current_message.
......@@ -324,12 +318,6 @@ public:
*/
void append_requested_call(double date);
/**
* @brief Appends a NO_MORE_STATIC_SUBMITTERS message.
* @param date The event date. Must be greater than or equal to the previous event.
*/
virtual void append_no_more_static_submitters(double date);
// Management functions
/**
* @brief Clears inner content. Should be called directly after generate_current_message.
......
......@@ -188,11 +188,6 @@ void server_on_submitter_bye(ServerData * data,
XBT_DEBUG("A submitted said goodbye. Number of finished submitters: %d",
data->nb_submitters_finished);
if(data->nb_submitters_finished == data->expected_nb_submitters)
{
data->context->proto_writer->append_no_more_static_submitters(MSG_get_clock());
}
check_simulation_finished(data);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment