From: Ben Pfaff <blp@nicira.com>
Date: Tue, 23 Aug 2011 16:26:29 +0000 (-0700)
Subject: ovs.db.idl: Actually use Idl.__modify_row()'s return value.
X-Git-Tag: v1.3.0~409
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d48f8f8bd90922bebbbd46106d8343b2eb1571e;p=sliver-openvswitch.git

ovs.db.idl: Actually use Idl.__modify_row()'s return value.

Idl.__parse_row_update() assumed that every change that the database server
sent down actually modified the database.  This is generally true, but
since Idl.__modify_row() already returns whether there was a change, we
might as well use it.

Reported-by: Reid Price <reid@nicira.com>
---

diff --git a/python/ovs/db/idl.py b/python/ovs/db/idl.py
index 2a04a98f4..abb7a444a 100644
--- a/python/ovs/db/idl.py
+++ b/python/ovs/db/idl.py
@@ -222,32 +222,37 @@ class Idl:
     def __parse_row_update(self, table, uuid, old, new):
         """Returns True if a column changed, False otherwise."""
         row = self.data[table.name].get(uuid)
+        changed = False
         if not new:
             # Delete row.
             if row:
                 del self.data[table.name][uuid]
+                changed = True
             else:
                 # XXX rate-limit
                 logging.warning("cannot delete missing row %s from table %s"
                                 % (uuid, table.name))
-                return False
         elif not old:
             # Insert row.
             if not row:
                 row = self.__create_row(table, uuid)
+                changed = True
             else:
                 # XXX rate-limit
                 logging.warning("cannot add existing row %s to table %s"
                                 % (uuid, table.name))
-            self.__modify_row(table, row, new)
+            if self.__modify_row(table, row, new):
+                changed = True
         else:
             if not row:
                 row = self.__create_row(table, uuid)
+                changed = True
                 # XXX rate-limit
                 logging.warning("cannot modify missing row %s in table %s"
                                 % (uuid, table_name))
-            self.__modify_row(table, row, new)
-        return True
+            if self.__modify_row(table, row, new):
+                changed = True
+        return changed
 
     def __modify_row(self, table, row, row_json):
         changed = False