Fixing Issues when deletes had race condition (#2678)

noobaa · Feb 7, 2017 · 92796da · 92796da
1 parent 2d5bf7f
commit 92796da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/server/object_services/map_deleter.js b/src/server/object_services/map_deleter.js
@@ -25,11 +25,13 @@ function delete_object_mappings(obj) {
 }
 
 function delete_chunks_if_unreferenced(chunk_ids, delete_date) {
+    dbg.log2('delete_chunks_if_unreferenced: chunk_ids', chunk_ids);
     return MDStore.instance().find_parts_unreferenced_chunk_ids(chunk_ids)
         .then(unreferenced_chunk_ids => delete_chunks(unreferenced_chunk_ids, delete_date));
 }
 
 function delete_chunks(chunk_ids, delete_date) {
+    dbg.log2('delete_chunks: chunk_ids', chunk_ids);
     return P.join(
             MDStore.instance().find_blocks_of_chunks(chunk_ids),
             MDStore.instance().delete_blocks_of_chunks(chunk_ids, delete_date),

diff --git a/src/server/object_services/md_store.js b/src/server/object_services/md_store.js
@@ -446,7 +446,7 @@ class MDStore {
                 deleted: delete_date
             },
             $rename: {
-                obj: 'obj_del',
+                // obj: 'obj_del',
                 num: 'num_del',
             }
         });
@@ -612,9 +612,9 @@ class MDStore {
                 deleted: delete_date
             },
             $rename: {
-                obj: 'obj_del',
+                // obj: 'obj_del',
                 start: 'start_del',
-                chunk: 'chunk_del',
+                // chunk: 'chunk_del',
             }
         });
     }
@@ -876,10 +876,10 @@ class MDStore {
             $set: {
                 deleted: delete_date
             },
-            $rename: {
-                chunk: 'chunk_del',
-                node: 'node_del',
-            }
+            // $rename: {
+            //     chunk: 'chunk_del',
+            //     node: 'node_del',
+            // }
         });
     }