Merge lp:~sinzui/charmworld/migrate-new-index into lp:~juju-jitsu/charmworld/trunk

[Curtis Hovey]

Update migration script to handle new deploys.

Update migration script to handle new deploys.

RULES

    Pre-implementation: no one
    * Update migration 18 to not fail when there is no ES index to update.
      * Either look before acting, or recover from an IndexMissing error

QA

    * Do a new deploy of apache, charmworld, elasticsearch and mongodb
    * Verify all services start without error. The bug manifested itself
      as a relation-error. The migration script was called when the db
      and the index joined.

IMPLEMENTATION

    * I used translate_error to adapt the ES failure and the script
      treats IndexMissing as a success because there are no bundles
      to delete.
    * Note I had to add the index back at the end of the test to ensure
      tear down succeeded. I could have instead replaced the setup
      method with another method that each test calls to get a preexisting
      ES.

[Benji York (benji)]

Looks good.

review: Approve

=== modified file 'charmworld/migrations/versions/018_delete_all_bundles.py'
--- charmworld/migrations/versions/018_delete_all_bundles.py	2013-08-23 12:12:25 +0000
+++ charmworld/migrations/versions/018_delete_all_bundles.py	2013-09-06 13:06:48 +0000
@@ -1,10 +1,18 @@
 # Copyright 2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from pyelasticsearch.exceptions import ElasticHttpNotFoundError
+from charmworld.search import (
+    BUNDLE,
+    IndexMissing,
+    translate_error,
+)
 
-from charmworld.search import BUNDLE
 
 def upgrade(db, index_client):
     db.bundles.remove({}, False)
-    index_client._client.delete_all(index_client.index_name, BUNDLE)
+    try:
+        with translate_error():
+            index_client._client.delete_all(index_client.index_name, BUNDLE)
+    except IndexMissing:
+        # There is nothing to migrate.
+        pass

=== modified file 'charmworld/migrations/versions/tests/test_migrations.py'
--- charmworld/migrations/versions/tests/test_migrations.py	2013-08-28 20:26:59 +0000
+++ charmworld/migrations/versions/tests/test_migrations.py	2013-09-06 13:06:48 +0000
@@ -6,23 +6,17 @@
 
 from charmworld.models import (
     Bundle,
-    CharmSource,
-    construct_charm_id,
-    FeaturedSource,
-    QADataSource,
     store_bundles,
 )
 from charmworld.search import (
     BUNDLE,
-    CHARM,
+    IndexMissing,
 )
 from charmworld.testing import (
-    factory,
     MongoTestBase,
 )
 from charmworld.migrations import migrate
 from charmworld.migrations.migrate import Versions
-from charmworld.tests.test_search import put_mapping
 
 import mock
 
@@ -62,7 +56,8 @@
         basket_id = "%s/%d" % (basket_name, basket_rev)
         self.search_id = Bundle.construct_id(
             owner, basket_name, bundle_name)
-        store_bundles(self.db.bundles, parsed, owner, basket_id,
+        store_bundles(
+            self.db.bundles, parsed, owner, basket_id,
             index_client=self.index_client)
 
     def test_bundles_are_removed_from_elastic_search(self):
@@ -78,3 +73,14 @@
         self.versions.run_migration(
             self.db, self.index_client, '018_delete_all_bundles.py')
         self.assertIsNone(self.db.bundles.find_one({}))
+
+    def test_new_db_and_index_are_noop(self):
+        # The migration script survives MIssingIndex errors.
+        # New installs don't have ES indexes yet.
+        self.index_client.delete_index()
+        with self.assertRaises(IndexMissing):
+            self.index_client.get_status()
+        self.versions.run_migration(
+            self.db, self.index_client, '018_delete_all_bundles.py')
+        # Put the index back for the test case to handle.
+        self.index_client.create_index()