Merge "ceph: fix write emulation"

gnocchi/carbonara.py

@@ -415,12 +415,6 @@ def offset_from_split(self):
         return int((self.first.value - split) // (self.sampling * 10e8)
                    * self.SERIAL_LEN)
 
-    @staticmethod
-    def padding(offset):
-        offset = offset // AggregatedTimeSerie.SERIAL_LEN
-        pad = [False] * offset * 2
-        return struct.pack('<' + '?d' * offset, *pad)
-
     def _truncate(self, quick=False):
         """Truncate the timeserie."""
         if self.max_size is not None:

gnocchi/storage/ceph.py

@@ -257,12 +257,7 @@ def _store_metric_measures(self, metric, timestamp_key, aggregation,
                                granularity, data, offset=0, version=3):
         name = self._get_object_name(metric, timestamp_key,
                                      aggregation, granularity, version)
-        try:
-            self.ioctx.write(name, data, offset=offset)
-        except rados.ObjectNotFound:
-            # first time writing data
-            self.ioctx.write_full(
-                name, carbonara.AggregatedTimeSerie.padding(offset) + data)
+        self.ioctx.write(name, data, offset=offset)
         self.ioctx.set_xattr("gnocchi_%s_container" % metric.id, name, "")
 
     def _delete_metric_measures(self, metric, timestamp_key, aggregation,

gnocchi/tests/base.py

@@ -140,11 +140,11 @@ def write(self, key, value, offset):
             self._validate_key(key)
             try:
                 current = self.kvs[key]
-                if len(current) < offset:
-                    current += b'\x00' * (offset - len(current))
-                self.kvs[key] = current[:offset] + value
             except KeyError:
-                raise FakeRadosModule.ObjectNotFound
+                current = b""
+            if len(current) < offset:
+                current += b'\x00' * (offset - len(current))
+            self.kvs[key] = current[:offset] + value
 
         def stat(self, key):
             self._validate_key(key)