diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py
index 7ad5bcb37b0..fbff9f45bda 100644
--- a/neutron/db/agentschedulers_db.py
+++ b/neutron/db/agentschedulers_db.py
@@ -65,8 +65,14 @@ class AgentSchedulerDbMixin(agents_db.AgentDbMixin):
             #                   filter is set, only agents which are 'up'
             #                   (i.e. have a recent heartbeat timestamp)
             #                   are eligible, even if active is False
-            return not agent_utils.is_agent_down(
-                agent['heartbeat_timestamp'])
+            if agent_utils.is_agent_down(agent['heartbeat_timestamp']):
+                LOG.warning('Agent %(agent)s is down. Type: %(type)s, host: '
+                            '%(host)s, heartbeat: %(heartbeat)s',
+                            {'agent': agent['id'], 'type': agent['agent_type'],
+                             'host': agent['host'],
+                             'heartbeat': agent['heartbeat_timestamp']})
+                return False
+            return True
 
     def update_agent(self, context, id, agent):
         original_agent = self.get_agent(context, id)
diff --git a/neutron/scheduler/dhcp_agent_scheduler.py b/neutron/scheduler/dhcp_agent_scheduler.py
index a7f24bc30ed..02ef39b83aa 100644
--- a/neutron/scheduler/dhcp_agent_scheduler.py
+++ b/neutron/scheduler/dhcp_agent_scheduler.py
@@ -280,8 +280,17 @@ class DhcpFilter(base_resource_filter.BaseResourceFilter):
             plugin, context, network, hostable_dhcp_agents)
 
         if not hostable_dhcp_agents:
-            return {'n_agents': 0, 'hostable_agents': [],
-                    'hosted_agents': hosted_agents}
-        n_agents = min(len(hostable_dhcp_agents), n_agents)
-        return {'n_agents': n_agents, 'hostable_agents': hostable_dhcp_agents,
-                'hosted_agents': hosted_agents}
+            result = {'n_agents': 0, 'hostable_agents': [],
+                      'hosted_agents': hosted_agents}
+        else:
+            result = {'n_agents': min(len(hostable_dhcp_agents), n_agents),
+                      'hostable_agents': hostable_dhcp_agents,
+                      'hosted_agents': hosted_agents}
+        hostable_agents_ids = [a['id'] for a in result['hostable_agents']]
+        hosted_agents_ids = [a['id'] for a in result['hosted_agents']]
+        LOG.debug('Network hostable DHCP agents. Network: %(network)s, '
+                  'hostable agents: %(hostable_agents)s, hosted agents: '
+                  '%(hosted_agents)s', {'network': network['id'],
+                                        'hostable_agents': hostable_agents_ids,
+                                        'hosted_agents': hosted_agents_ids})
+        return result