From: Ivan Kolodyazhny <e0ne@e0ne.info>
Date: Wed, 15 Oct 2014 14:40:00 +0000 (+0300)
Subject: Remove check on db_exc.DBError
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=85078bd4e486fe663cfd1358b5cafd62afcb5f77;p=openstack-build%2Fcinder-build.git

Remove check on db_exc.DBError

After using oslo.db >= 0.4.0 we will never get DBError Exception

Change-Id: I94d6a155df1d71658e7271ab4d55122906216a87
---

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 7eb6ddac3..fd771a9b8 100644
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -514,9 +514,8 @@ def iscsi_target_create_safe(context, values):
         with session.begin():
             session.add(iscsi_target_ref)
             return iscsi_target_ref
-    # TODO(e0ne): Remove check on db_exc.DBError, when
-    #             Cinder will use oslo.db 0.4.0 or higher.
-    except (db_exc.DBError, db_exc.DBDuplicateEntry):
+    except db_exc.DBDuplicateEntry:
+        LOG.debug("Can not add duplicate IscsiTarget.")
         return None