diff --git a/nrm/containers.py b/nrm/containers.py index d0a4bb090e4f4b3fd089e4ed372c3d56fddee817..bf18dc4b3f23ae1f8a2ff3f48d2943f83323599f 100644 --- a/nrm/containers.py +++ b/nrm/containers.py @@ -77,7 +77,7 @@ class ContainerManager(object): container_power['profile']['end'] = dict() if pp['policy'] != "NONE": container_power['policy'] = pp['policy'] - container_power['damper'] = pp['damper'] + container_power['damper'] = manifest.ratelimit container_power['slowdown'] = pp['slowdown'] # Compute hardware bindings @@ -131,7 +131,7 @@ class ContainerManager(object): if container.power.get('policy'): environ['LD_PRELOAD'] = self.pmpi_lib environ['NRM_TRANSMIT'] = '1' - environ['NRM_DAMPER'] = container.power['damper'] + environ['ARGO_NRM_RATELIMIT'] = container.power['damper'] # monitoring section involves libnrm if manifest.is_feature_enabled('monitoring'): diff --git a/nrm/schemas/manifest.yml b/nrm/schemas/manifest.yml index fc18d88124d5baa3c66a3883aade8e66344e4860..b32752d683380aa073c4c262820a744f426ef8d2 100644 --- a/nrm/schemas/manifest.yml +++ b/nrm/schemas/manifest.yml @@ -127,7 +127,6 @@ properties: required: - profile - policy - - damper - slowdown properties: # @@ -146,13 +145,7 @@ properties: profile: type: boolean # -# `damper` is a dampering parameter for the DDCM policy.:: -# - damper: - type: number - minimum: 0 -# -# `slowdown` is a dampering parameter for the DVFS policy.:: +# `slowdown` is a parameter for the DVFS policy.:: # slowdown: type: number