Fix multi part issues with sequence part

noobaa · Aug 5, 2015 · 1876665 · 1876665
1 parent 372b70b
commit 1876665
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/api/object_api.js b/src/api/object_api.js
@@ -246,6 +246,9 @@ module.exports = {
                                     type: 'array',
                                     items: 'string',
                                 },
+                                upload_part_number: {
+                                    type: 'integer',
+                                },
                             }
                         }
                     }

diff --git a/src/api/object_driver.js b/src/api/object_driver.js
@@ -267,6 +267,7 @@ ObjectDriver.prototype.upload_stream_parts = function(params) {
                             key: params.key,
                             parts: _.map(parts, function(part) {
                                 var p = _.pick(part, 'start', 'end');
+                                p.upload_part_number = upload_part_number;
                                 if (!part.dedup) {
                                     p.block_ids = _.flatten(
                                         _.map(part.fragments, function(fragment) {

diff --git a/src/server/object_mapper.js b/src/server/object_mapper.js
@@ -122,6 +122,7 @@ function allocate_object_parts(bucket, obj, parts) {
                     return {
                         start: part.start,
                         end: part.end,
+                        upload_part_number: part.upload_part_number,
                         part_sequence_number: part.part_sequence_number
                     };
                 });
@@ -261,14 +262,16 @@ function allocate_object_parts(bucket, obj, parts) {
  */
 function finalize_object_parts(bucket, obj, parts) {
     var block_ids = _.flatten(_.map(parts, 'block_ids'));
-    dbg.log1('finalize_object_parts');
     var chunks;
+    var upload_part_number = (parts[0].upload_part_number ? parts[0].upload_part_number : null);
+    dbg.log1('finalize_object_parts', upload_part_number);
     return Q.all([
 
             // find parts by start offset, deleted parts are handled later
             db.ObjectPart
             .find({
                 obj: obj.id,
+                upload_part_number: upload_part_number,
                 start: {
                     $in: _.map(parts, 'start')
                 }