CA-227807: Internal Error on uploading unsigned Dundee hotfix

Signed-off-by: kun ma <[email protected]>

Author: makunterry

ocaml/xapi/xapi_pool_patch.ml

@@ -65,6 +65,7 @@ let pool_patch_upload_handler (req: Http.Request.t) s _ =
                      Db.Task.set_result ~__context ~self:(Context.get_task_id __context) ~value:(Ref.string_of patch);
                      TaskHelper.complete ~__context None
                    with e ->
+                     Client.VDI.destroy rpc session_id vdi;
                      TaskHelper.failed ~__context e
                  end
                | None ->

ocaml/xapi/xapi_pool_update.ml

@@ -144,13 +144,19 @@ let detach ~__context ~self =
   detach_helper ~__context ~uuid ~vdi
 
 let with_api_errors f x =
+  let errinfo = "Please upload a valid package." in
   try f x
   with
   | Smint.Command_failed(ret, status, stdout_log, stderr_log)
   | Smint.Command_killed(ret, status, stdout_log, stderr_log) ->
     let msg = Printf.sprintf "Smint.Command_{failed,killed} ret = %d; status = %s; stdout = %s; stderr = %s"
         ret status stdout_log stderr_log in
-    raise (Api_errors.Server_error (Api_errors.internal_error, [msg]))
+    error "%s" msg;
+    raise (Api_errors.Server_error (Api_errors.invalid_update, [errinfo]))
+  | e ->
+    let msg = ExnHelper.string_of_exn e in
+    error "%s" msg;
+    raise (Api_errors.Server_error (Api_errors.invalid_update, [errinfo]))
 
 (* yum confif example
    [main]