]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Fix a usage error of joinedload + filter in dhcp scheduler
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Tue, 27 Jan 2015 06:33:36 +0000 (15:33 +0900)
committerYAMAMOTO Takashi <yamamoto@valinux.co.jp>
Thu, 19 Mar 2015 04:44:21 +0000 (13:44 +0900)
commit96aa9f93600d6e97394ad725e095d5539848ca2d
tree44418d890dab619b71c72a01af2e59263ef05ab4
parent4cda123a86f65b2542553fde65ca8d36062e1f52
Fix a usage error of joinedload + filter in dhcp scheduler

This commit fixes filtering in get_dhcp_agents_hosting_networks.

Also, separate the argument "active" into two; active (heartbeat thing)
and admin_state_up.  Because all in-tree callers with active=True seem
to mean only the former, currently the new admin_state_up argument is not
used.  (Thus this commit doesn't change any behaviour yet.  The argument
might be useful for other changes like [1])

[1] https://review.openstack.org/#/c/147032/

Details:

With the current coding, joinedload() produces a JOIN and
the following filter() on the columns from the joined table
would create another JOIN of the same table.  (As t1 in the
following example).  It doesn't seem to be the intended
behaviour.  As a consequence the filter (WHERE clause in
the following examples) doesn't work as expected.

Queries before this fix looked like the following,
where t1 and t2 are Agent and NetworkDhcpAgentBinding respectively:

    SELECT t2.aaa, t1_1.bbb, ...
    FROM t1, t2 LEFT OUTER JOIN t1 AS t1_1 ON t1_1.ccc = t2.ddd
    WHERE t1.eee = ...;

After the fix, it would be:

    SELECT t2.aaa, t1.bbb, ...
    FROM t2 JOIN t1 ON t1.ccc = t2.ddd
    WHERE t1.eee = ...;

Reference: http://docs.sqlalchemy.org/en/rel_0_9/orm/loading_relationships.html#contains-eager

Closes-Bug: #1414905
Change-Id: Idf9ffdb849de58fba8c18c357ffa10cf0f398140
neutron/db/agentschedulers_db.py
neutron/tests/unit/test_dhcp_scheduler.py