Merge lp:~notmyname/swift/stale_headers into lp:~hudson-openstack/swift/trunk

[John Dickinson]

deleting a database (account or container) now also clears the metadata

[gholt (gholt)]

Cool

review: Approve

[lp:~notmyname/swift/stale_headers]

350. By John Dickinson on 2011-08-29

cleaned up local variable

[Chuck Thier (cthier)]

Looks good

review: Approve

=== modified file 'swift/common/db.py'
--- swift/common/db.py	2011-08-12 18:29:16 +0000
+++ swift/common/db.py	2011-08-29 20:27:30 +0000
@@ -253,6 +253,12 @@
         :param timestamp: delete timestamp
         """
         timestamp = normalize_timestamp(timestamp)
+        # first, clear the metadata
+        cleared_meta = {}
+        for k in self.metadata.iterkeys():
+            cleared_meta[k] = ('', timestamp)
+        self.update_metadata(cleared_meta)
+        # then mark the db as deleted
         with self.get() as conn:
             self._delete_db(conn, timestamp)
             conn.commit()

=== modified file 'test/unit/common/test_db.py'
--- test/unit/common/test_db.py	2011-08-12 18:29:16 +0000
+++ test/unit/common/test_db.py	2011-08-29 20:27:30 +0000
@@ -141,24 +141,39 @@
             conn.execute('SELECT * FROM incoming_sync')
 
     def test_delete_db(self):
+        def init_stub(conn, put_timestamp):
+            conn.execute('CREATE TABLE test (one TEXT)')
+            conn.execute('CREATE TABLE test_stat (id TEXT)')
+            conn.execute('INSERT INTO test_stat (id) VALUES (?)',
+                        (str(uuid4),))
+            conn.execute('INSERT INTO test (one) VALUES ("1")')
+            conn.commit()
         stub_called = [False]
-        def stub(*args, **kwargs):
+        def delete_stub(*a, **kw):
             stub_called[0] = True
         broker = DatabaseBroker(':memory:')
-        broker._initialize = stub
+        broker.db_type = 'test'
+        broker._initialize = init_stub
+        # Initializes a good broker for us
         broker.initialize(normalize_timestamp('1'))
         self.assert_(broker.conn is not None)
-        broker._delete_db = stub
+        broker._delete_db = delete_stub
         stub_called[0] = False
         broker.delete_db('2')
         self.assert_(stub_called[0])
         broker = DatabaseBroker(os.path.join(self.testdir, '1.db'))
-        broker._initialize = stub
+        broker.db_type = 'test'
+        broker._initialize = init_stub
         broker.initialize(normalize_timestamp('1'))
-        broker._delete_db = stub
+        broker._delete_db = delete_stub
         stub_called[0] = False
         broker.delete_db('2')
         self.assert_(stub_called[0])
+        # ensure that metadata was cleared
+        m2 = broker.metadata
+        self.assert_(not any(v[0] for v in m2.itervalues()))
+        self.assert_(all(v[1] == normalize_timestamp('2')
+                        for v in m2.itervalues()))
 
     def test_get(self):
         broker = DatabaseBroker(':memory:')