[bos #35138][EDF] (2023-T1) Specialization of resources in KERNEL. JobParameters resource_required type changed to ResourceParametersJob.

This commit is contained in:
Konstantin Leontev 2023-08-11 11:42:35 +01:00
parent 85825d340a
commit 0efec76389

View File

@ -451,9 +451,9 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
//const char * resourceName = "nepal@nepal"; //const char * resourceName = "nepal@nepal";
const char * resourceName = _configMap[configId].resname; const char * resourceName = _configMap[configId].resname;
Engines::ResourceDefinitionContainer* resourceDefinition; Engines::ResourceDefinitionJob* resourceDefinition = nullptr;
try { try {
resourceDefinition = _resourcesManager->GetResourceDefinitionContainer(resourceName); resourceDefinition = _resourcesManager->GetResourceDefinitionJob(resourceName);
} }
catch (const CORBA::SystemException& ex) { catch (const CORBA::SystemException& ex) {
_lastErrorMessage = std::string("We can not access the resource ") + std::string(resourceName); _lastErrorMessage = std::string("We can not access the resource ") + std::string(resourceName);
@ -470,8 +470,8 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
// CAUTION: the additional two following parameters MUST be // CAUTION: the additional two following parameters MUST be
// specified explicitly, because they are not provided by the // specified explicitly, because they are not provided by the
// resource definition: // resource definition:
jobParameters->resource_required.mem_mb = resourceDefinition->mem_mb; // jobParameters->resource_required.mem_mb = resourceDefinition->mem_mb;
jobParameters->resource_required.nb_proc = resourceDefinition->nb_proc_per_node; // jobParameters->resource_required.nb_proc = resourceDefinition->nb_proc_per_node;
// CAUTION: the parameter mem_mb specifies the maximum memory value // CAUTION: the parameter mem_mb specifies the maximum memory value
// that could be allocated for executing the job. This takes into // that could be allocated for executing the job. This takes into
// account not only the data that could be loaded by the batch // account not only the data that could be loaded by the batch