Remove unused db calls to fetch original metadata

Remove unnecessary db calls made to fetch
original metadata when delete flag is set
to True.

Closes-Bug: #1246291

Change-Id: If7483b8b21f71efa5e7c211b031170bc03eb6b9b

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index c17330d63140ece28d06da78f0aaf61f4e9a5e91..15bf95467a86f40c9dd58233840ddf41434be5bd 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -600,10 +600,10 @@ class API(base.Base):
         `metadata` argument will be deleted.
 
         """
-        orig_meta = self.get_volume_metadata(context, volume)
         if delete:
             _metadata = metadata
         else:
+            orig_meta = self.get_volume_metadata(context, volume)
             _metadata = orig_meta.copy()
             _metadata.update(metadata)
 
@@ -645,10 +645,10 @@ class API(base.Base):
         `metadata` argument will be deleted.
 
         """
-        orig_meta = self.get_volume_admin_metadata(context, volume)
         if delete:
             _metadata = metadata
         else:
+            orig_meta = self.get_volume_admin_metadata(context, volume)
             _metadata = orig_meta.copy()
             _metadata.update(metadata)
 
@@ -679,10 +679,10 @@ class API(base.Base):
         `metadata` argument will be deleted.
 
         """
-        orig_meta = self.get_snapshot_metadata(context, snapshot)
         if delete:
             _metadata = metadata
         else:
+            orig_meta = self.get_snapshot_metadata(context, snapshot)
             _metadata = orig_meta.copy()
             _metadata.update(metadata)