Rollback quota when share network create API fails.

During share network create API, if failure occurs quota is not rolled
back and its usable only after quota reservations timed out (waiting
conf.reservation_expire seconds).

Closes-bug: #1975483
Change-Id: I3de8f5bfa6ac4580da9b1012caa25657a6df71ec
(cherry picked from commit 8c854a1)

manila/api/v2/share_networks.py

@@ -382,6 +382,7 @@ def _consumed(name):
                 share_network = db_api.share_network_create(
                     context, share_network_values)
             except db_exception.DBError as e:
+                QUOTAS.rollback(context, reservations)
                 LOG.exception(e)
                 msg = "Could not create share network."
                 raise exc.HTTPInternalServerError(explanation=msg)
@@ -397,7 +398,8 @@ def _consumed(name):
                     context, share_network_subnet_values)
             except db_exception.DBError:
                 db_api.share_network_delete(context, share_network['id'])
-                msg = _('Could not create share network.')
+                QUOTAS.rollback(context, reservations)
+                msg = _('Could not create share network subnet.')
                 raise exc.HTTPInternalServerError(explanation=msg)
 
             QUOTAS.commit(context, reservations)

manila/tests/api/v2/test_share_networks.py

@@ -276,13 +276,29 @@ def test_create_az_not_found(self, data):
                           req,
                           body)
 
+    def test_create_error_on_network_creation(self):
+        self.mock_object(share_networks.QUOTAS, 'reserve',
+                         mock.Mock(return_value='fake_reservation'))
+        self.mock_object(share_networks.QUOTAS, 'rollback')
+        self.mock_object(db_api, 'share_network_create',
+                         mock.Mock(side_effect=db_exception.DBError()))
+
+        self.assertRaises(webob_exc.HTTPInternalServerError,
+                          self.controller.create,
+                          self.req,
+                          self.body)
+        self.assertTrue(share_networks.QUOTAS.rollback.called)
+
     def test_create_error_on_subnet_creation(self):
         data = {
             'neutron_net_id': 'fake',
             'neutron_subnet_id': 'fake',
             'id': fake_share_network['id']
         }
         subnet_data = copy.deepcopy(data)
+        self.mock_object(share_networks.QUOTAS, 'reserve',
+                         mock.Mock(return_value='fake_reservation'))
+        self.mock_object(share_networks.QUOTAS, 'rollback')
         self.mock_object(db_api, 'share_network_create',
                          mock.Mock(return_value=fake_share_network))
         self.mock_object(db_api, 'share_network_subnet_create',
@@ -302,6 +318,7 @@ def test_create_error_on_subnet_creation(self):
             self.context, subnet_data)
         db_api.share_network_delete.assert_called_once_with(
             self.context, fake_share_network['id'])
+        self.assertTrue(share_networks.QUOTAS.rollback.called)
 
     def test_delete_nominal(self):
         share_nw = fake_share_network.copy()

releasenotes/notes/bug-1975483-rollback-quota-if-share-network-create-fails-628312233bf0c179.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    During share network create API, if either share network or share network
+    subnet db creation fails, manila raises an exception. However quota is not
+    rolled back and its usable only after quota reservations timed out (waiting
+    conf.reservation_expire seconds). Fixed by introducing immediate quota
+    rollback in case any db create api fails.