Skip to content

Commit c7c710d

Browse files
committed
fix: do not divide maxRAM
1 parent 38ed9b9 commit c7c710d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/DIRAC/WorkloadManagementSystem/Client/Matcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def _processResourceDescription(self, resourceDescription):
196196
maxRAM = resourceDescription.get("MaxRAM")
197197
if maxRAM:
198198
try:
199-
maxRAM = int(maxRAM / 1000)
199+
maxRAM = int(maxRAM)
200200
except ValueError:
201201
maxRAM = None
202202
nProcessors = resourceDescription.get("NumberOfProcessors")

src/DIRAC/WorkloadManagementSystem/Executor/test/Test_Executor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def test__applySiteFilter(sites, banned, expected):
5555
({"Tag": "bof"}, ["bof"]),
5656
({"Tags": "bof, bif"}, ["bof", "bif"]),
5757
({"MaxRAM": 2500}, ["2500MB"]),
58-
({"Tags": "bof, bif", "MaxRAM": 2048}, ["bof", "bif", "2500MB"]),
59-
({"WholeNode": "yes", "MaxRAM": 2048}, ["WholeNode", "MultiProcessor", "2500MB"]),
58+
({"Tags": "bof, bif", "MaxRAM": 2048}, ["bof", "bif", "2048MB"]),
59+
({"WholeNode": "yes", "MaxRAM": 2048}, ["WholeNode", "MultiProcessor", "2048MB"]),
6060
({"NumberOfProcessors": 1}, []),
6161
({"NumberOfProcessors": 4}, ["MultiProcessor", "4Processors"]),
6262
({"NumberOfProcessors": 4, "MinNumberOfProcessors": 2}, ["MultiProcessor", "4Processors"]),

0 commit comments

Comments
 (0)