summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Jones <morgan@parelastic.com>2015-04-02 16:46:13 -0400
committerMorgan Jones <morgan@parelastic.com>2015-04-02 16:46:13 -0400
commit6a0fa9bbde2e911f16572bbdc12bd63d411b49b2 (patch)
tree1a16ff6549fc55164e163614c873680ffcce847a
parent0f898f786131097aa10c4c31bb9e54df13d6f9b7 (diff)
downloadtrove-6a0fa9bbde2e911f16572bbdc12bd63d411b49b2.tar.gz
Use UTC to compute heartbeat age in eject-replica-source
Use datetime.utcnow() rather than datetime.now() when computing the age of guest-agent heartbeats. Change-Id: Ia884db023e5b2cd076b3f9edb694caf428c8ca81 Closes-bug: #1439844
-rw-r--r--trove/instance/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/trove/instance/models.py b/trove/instance/models.py
index 36ee49c1..79f4e4a0 100644
--- a/trove/instance/models.py
+++ b/trove/instance/models.py
@@ -955,7 +955,7 @@ class Instance(BuiltInstance):
raise exception.BadRequest(_("Instance %s is not a replica"
" source.") % self.id)
service = InstanceServiceStatus.find_by(instance_id=self.id)
- last_heartbeat_delta = datetime.now() - service.updated_at
+ last_heartbeat_delta = datetime.utcnow() - service.updated_at
agent_expiry_interval = timedelta(seconds=CONF.agent_heartbeat_expiry)
if last_heartbeat_delta < agent_expiry_interval:
raise exception.BadRequest(_("Replica Source %s cannot be ejected"