[COST-5772] gracefully handle IntegrityError on ocppvc table (#5528)

* [COST-5772] wrap operations on ocppvc table in a transaction

* drop transaction and clean up log msg

* log exception and add unit test

* clean up unittest

Author: djnakabaale

koku/masu/database/ocp_report_db_accessor.py

@@ -11,6 +11,7 @@
 import uuid
 
 from dateutil.parser import parse
+from django.db import IntegrityError
 from django.db.models import DecimalField
 from django.db.models import F
 from django.db.models import Value
@@ -836,7 +837,16 @@ def populate_cluster_table(self, provider, cluster_id, cluster_alias):
 
     def populate_node_table(self, cluster, nodes):
         """Get or create an entry in the OCP node table."""
-        LOG.info(log_json(msg="populating reporting_ocp_nodes table", schema=self.schema, cluster=cluster))
+
+        LOG.info(
+            log_json(
+                msg="populating reporting_ocp_nodes table",
+                schema=self.schema,
+                cluster_id=cluster.cluster_id,
+                cluster_alias=cluster.cluster_alias,
+            )
+        )
+
         for node in nodes:
             tmp_node = OCPNode.objects.filter(
                 node=node[0], resource_id=node[1], node_capacity_cpu_cores=node[2], cluster=cluster
@@ -856,23 +866,50 @@ def populate_node_table(self, cluster, nodes):
 
     def populate_pvc_table(self, cluster, pvcs):
         """Get or create an entry in the OCP cluster table."""
-        LOG.info(log_json(msg="populating reporting_ocp_pvcs table", schema=self.schema, cluster=cluster))
+
+        LOG.info(
+            log_json(
+                msg="populating reporting_ocp_pvcs table",
+                schema=self.schema,
+                cluster_id=cluster.cluster_id,
+                cluster_alias=cluster.cluster_alias,
+            )
+        )
+
         for pvc in pvcs:
-            try:
-                ocppvc = OCPPVC.objects.get(persistent_volume=pvc[0], persistent_volume_claim=pvc[1], cluster=cluster)
+            ocppvc = OCPPVC.objects.filter(
+                persistent_volume=pvc[0], persistent_volume_claim=pvc[1], cluster=cluster
+            ).first()
+            if ocppvc:
                 if not ocppvc.csi_volume_handle:
                     # Update the existing record's csi_volume_handle
                     ocppvc.csi_volume_handle = pvc[2]
                     ocppvc.save(update_fields=["csi_volume_handle"])
-            except OCPPVC.DoesNotExist:
-                # If the record does not exist, create a new one
-                OCPPVC.objects.create(
-                    persistent_volume=pvc[0], persistent_volume_claim=pvc[1], csi_volume_handle=pvc[2], cluster=cluster
-                )
+            else:
+                # If the record does not exist, try creating a new one
+                try:
+                    OCPPVC.objects.create(
+                        persistent_volume=pvc[0],
+                        persistent_volume_claim=pvc[1],
+                        csi_volume_handle=pvc[2],
+                        cluster=cluster,
+                    )
+
+                except IntegrityError as e:
+                    LOG.warning(log_json(msg="IntegrityError raised when creating pvc", pvc=pvc), exc_info=e)
 
     def populate_project_table(self, cluster, projects):
         """Get or create an entry in the OCP cluster table."""
-        LOG.info(log_json(msg="populating reporting_ocp_projects table", schema=self.schema, cluster=cluster))
+
+        LOG.info(
+            log_json(
+                msg="populating reporting_ocp_projects table",
+                schema=self.schema,
+                cluster_id=cluster.cluster_id,
+                cluster_alias=cluster.cluster_alias,
+            )
+        )
+
         for project in projects:
             OCPProject.objects.get_or_create(project=project, cluster=cluster)
 

koku/masu/test/database/test_ocp_report_db_accessor.py

@@ -14,6 +14,7 @@
 from unittest.mock import patch
 
 from django.conf import settings
+from django.db import IntegrityError
 from django.db.models import Q
 from django.db.models import Sum
 from django_tenants.utils import schema_context
@@ -727,6 +728,24 @@ def test_populate_node_table_second_time_no_change(self):
             ).count()
             self.assertEqual(node_count, 1)
 
+    @patch("reporting.provider.ocp.models.OCPPVC.objects.create", side_effect=IntegrityError)
+    @patch("masu.database.ocp_report_db_accessor.LOG.warning")
+    def test_populate_pvc_table_handles_integrity_error(self, mock_log, mock_create):
+        """Test that populating OCPPVC table handles IntegrityError exception."""
+
+        pvcs = ["pvc_1", "pvc_2"]
+        cluster_id = uuid.uuid4()
+        cluster_alias = "test-cluster-1"
+
+        with self.accessor as accessor:
+            cluster = accessor.populate_cluster_table(self.ocp_provider, cluster_id, cluster_alias)
+            accessor.populate_pvc_table(cluster, pvcs)
+
+            mock_create.assert_called()
+            self.assertTrue(
+                any("IntegrityError raised when creating pvc" in str(call) for call in mock_log.call_args_list)
+            )
+
     def test_delete_infrastructure_raw_cost_from_daily_summary(self):
         """Test that infra raw cost is deleted."""
         with self.accessor as acc: