Skip to content

Commit

Permalink
Merge "config: yield during db sync to ifmap, for zk hearbeat mainten…
Browse files Browse the repository at this point in the history
…ance" into R2.20
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed May 26, 2015
2 parents 0ce934a + 411f8ca commit 6da3a8a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/config/api-server/vnc_cfg_ifmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -1380,6 +1380,9 @@ def _dbe_resync(self, obj_type, obj_uuids):
(ok, obj_dicts) = self._cassandra_db.read(
obj_type, obj_uuids, field_names=obj_fields)
for obj_dict in obj_dicts:
# give chance for zk heartbeat/ping
gevent.sleep(0)

try:
obj_uuid = obj_dict['uuid']
# TODO remove backward compat (use RT instead of VN->LR ref)
Expand Down

0 comments on commit 6da3a8a

Please sign in to comment.