Attachment 938753 Details for Bug 1090421 – Patch

Patch

agent-watch-delete-network.patch (text/plain), 1.90 KB, created by Miguel Angel Ajo on 2014-09-18 05:52:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Angel Ajo

Created: 2014-09-18 05:52:10 UTC

Size: 1.90 KB

patch

obsolete

>commit ebfda211836c32cfa05ef41acf6bc4543d1a94d8
>Author: Miguel Angel Ajo <mangelajo@redhat.com>
>Date:   Wed Sep 17 16:48:35 2014 +0200
>
>    fix neutron-agent-watch failure when deleting failed resource
>    
>    Resolves: rhbz#1090421
>    
>    Change-Id: Idc7b313e89fa205f7599a638159a687ae68df374
>
>diff --git a/neutron-agent-watch b/neutron-agent-watch
>index e2991e4..90a2e00 100755
>--- a/neutron-agent-watch
>+++ b/neutron-agent-watch
>@@ -382,10 +382,13 @@ class AgentWatcher(object):
>                 'missing_netns': missing_netns }
> 
>     def _remove_old_known_pidfiles(self, expected_pid_files):
>+        """ remove from our dictionary any traces of know pidfiles
>+            which aren't expected to be there anymore """
>+        pid_files_to_delete = (
>+            set(self._known_pid_files.keys()) - set(expected_pid_files))
> 
>-        for known in self._known_pid_files:
>-            if not known in expected_pid_files:
>-                self._remove_expected_pid_file(known)
>+        for pid in pid_files_to_delete:
>+            self._known_pid_files.pop(pid)
> 
>     def _does_netns_exist_for_resource(self, resource_uuid):
>         return self._get_ns_for_resource(resource_uuid) in self._netns_list
>diff --git a/openstack-neutron.spec b/openstack-neutron.spec
>index d5031f5..3d73efd 100644
>--- a/openstack-neutron.spec
>+++ b/openstack-neutron.spec
>@@ -2,7 +2,7 @@
> 
> Name:		openstack-neutron
> Version:	2013.2.3
>-Release:	16%{?dist}
>+Release:	17%{?dist}
> Provides:	openstack-quantum = %{version}-%{release}
> Obsoletes:	openstack-quantum < 2013.2-0.3.b3
> 
>@@ -1114,6 +1114,10 @@ fi
> 
> 
> %changelog
>+* Wed Sep 17 2014 Miguel Ãngel Ajo <majopela@redhat.com> 2013.2.3-17
>+- fixes the neutron-agent-watch failure when deleting a network
>+  rhbz#1090421
>+
> * Tue Aug 05 2014 Ihar Hrachyshka <ihrachys@redhat.com> 2013.2.3-16
> - no quota for allowed address pair, rhbz#1125946
> - Use simplejson instead of stdlib json module, rhbz#1113104

Actions: View

Attachments on bug 1090421: 901387 | 938753