Make disk space handled same way as other ranges. This should fix problem of...

Make disk space handled same way as other ranges. This should fix problem of disk requirement lost then converting between ADL and other languages - bug #3666.
parent f4177f18
......@@ -655,7 +655,7 @@ namespace Arc {
logger.msg(ERROR, "[ADLParser] Missing or wrong value in DiskSpaceRequirement.");
return false;
}
parsed_jobdescription.Resources.DiskSpaceRequirement.DiskSpace.min = (v - 1) / 1024*1024 + 1;
parsed_jobdescription.Resources.DiskSpaceRequirement.DiskSpace.max = (v - 1) / 1024*1024 + 1;
}
/// \mapattr Resources.RemoteSessionAccess -> SessionDirectoryAccess
if((bool)resources["adl:RemoteSessionAccess"]) {
......@@ -1018,8 +1018,8 @@ namespace Arc {
resources.NewChild("IndividualVirtualMemory") = tostring(job.Resources.IndividualVirtualMemory.max);
}
/// \mapattr Resources.DiskSpaceRequirement <- DiskSpace
if(job.Resources.DiskSpaceRequirement.DiskSpace.min > -1) {
resources.NewChild("DiskSpaceRequirement") = tostring(job.Resources.DiskSpaceRequirement.DiskSpace.min*1024*1024);
if(job.Resources.DiskSpaceRequirement.DiskSpace.max > -1) {
resources.NewChild("DiskSpaceRequirement") = tostring(job.Resources.DiskSpaceRequirement.DiskSpace.max*1024*1024);
}
/// \mapattr Resources.RemoteSessionAccess <- SessionDirectoryAccess
switch(job.Resources.SessionDirectoryAccess) {
......
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