From 60bd427fcaee4fda9e811d546e9aac2597d4f3e7 Mon Sep 17 00:00:00 2001
From: Martin Chacon Piza <MartinDavid.ChaconPiza@ts.fujitsu.com>
Date: Mon, 27 Aug 2018 14:43:23 +0200
Subject: [PATCH] Fixed the handling of metrics outside of the retention policy

Change-Id: I9fa9d7cf3093c207e4db29c1468e09146849615e
Story: 2003202
Task: 23358
---
 monasca_persister/repositories/persister.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/monasca_persister/repositories/persister.py b/monasca_persister/repositories/persister.py
index d1a49751..4a50e1c1 100644
--- a/monasca_persister/repositories/persister.py
+++ b/monasca_persister/repositories/persister.py
@@ -55,10 +55,15 @@ class Persister(object):
 
             self._data_points = []
             self._consumer.commit()
-        except Exception:
-            LOG.exception("Error writing to database: {}"
-                          .format(self._data_points))
-            raise
+        except Exception as ex:
+            if "partial write: points beyond retention policy dropped" in ex.message:
+                LOG.warning("Some points older than retention policy were dropped")
+                self._data_points = []
+                self._consumer.commit()
+            else:
+                LOG.exception("Error writing to database: {}"
+                              .format(self._data_points))
+                raise ex
 
     def run(self):
         try: