Merge pull request #776 from openvstorage/fix-objects-leak

fix object leak when deleting a global namespace
openvstorage · Aug 8, 2017 · 08bae27 · 08bae27
2 parents c17d657 + 18f2ebb
commit 08bae27
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/ocaml/src/maintenance.ml b/ocaml/src/maintenance.ml
@@ -1473,7 +1473,17 @@ class client ?(retry_timeout = 60.)
                      Exn (Assert_failed "NotMyTask") |> Lwt.fail
                    else inner next
               in
-              inner (Slice.wrap_string ""))
+              inner (Slice.wrap_string "") >>= fun () ->
+
+              client # global_kvs # apply_sequence
+                     (osd_access # get_default_osd_priority)
+                     []
+                     [ Osd.Update.delete_string (Osd_keys.AlbaInstance.namespace_status ~namespace_id);
+                       Osd.Update.delete_string (Osd_keys.AlbaInstance.namespace_name ~namespace_id);
+                     ] >>= function
+              | Ok _ -> Lwt.return_unit
+              | Error _ -> assert false
+             )
       | CleanupNamespaceOsd (namespace_id, osd_id) ->
         Lwt.catch
           (fun () ->