openstack/senlin
Code Issues Proposed changes

Merge "Fix lb healthmonitor delay/timeout unit"

Browse Source
This commit is contained in:
Jenkins 2016-07-15 02:38:35 +00:00 committed by Gerrit Code Review
commit 8d9d8355c9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/policies/lb_policy.yaml
View File

@ -45,12 +45,12 @@ properties:
# can be PING, TCP, HTTP, or HTTPS.
type: 'PING'
# The amount of time, in seconds, between sending probes to members.
delay: 10
# The amount of time, in milliseconds, between sending probes to members.
delay: 10000
# The maximum time in seconds that a monitor waits to connect before it
# times out. This value must be less than the delay value.
timeout: 5
# The maximum time in milliseconds that a monitor waits to connect before
# it times out. This value must be less than the delay value.
timeout: 5000
# The number of allowed connection failures before changing the status
# of the member to INACTIVE. A valid value is from 1 to 10.

6
senlin/policies/lb_policy.py
View File

@ -222,13 +222,13 @@ class LoadBalancingPolicy(base.Policy):
default=PING,
),
HM_DELAY: schema.Integer(
_('The amount of time in seconds between sending '
_('The amount of time in milliseconds between sending '
'probes to members.'),
default=10,
),
HM_TIMEOUT: schema.Integer(
_('The maximum time in seconds that a monitor waits to '
'connect before it times out.'),
_('The maximum time in milliseconds that a monitor waits '
'to connect before it times out.'),
default=5,
),
HM_MAX_RETRIES: schema.Integer(