Merge pull request xapi-project#4472 from xapi-project/private/linl/perf

CP-37549: Address subject-add performance issue

Author: liulinC

ocaml/tests/test_extauth_plugin_ADwinbind.ml

@@ -37,7 +37,8 @@ module ExtractOuConfig = Generic.MakeStateless (struct
           ; ("service-name", "conappada.local")
           ; ("ou", "TOU")
           ]
-        , ([("ou", "TOU")], ["createcomputer=TOU"]) )
+        , ([("ou", "TOU")], ["createcomputer=TOU"])
+        )
       ]
 end)
 
@@ -83,7 +84,8 @@ module ParseValueFromPbis = Generic.MakeStateless (struct
     `QuickAndAutoDocumented
       [
         ( "X'58005200540055004B002D00300032002D003000330024000000'"
-        , "XRTUK-02-03" )
+        , "XRTUK-02-03"
+        )
       ; ("X'4C004F00430041004C0048004F0053005400320024000000'", "LOCALHOST2")
       ]
 end)
@@ -135,7 +137,8 @@ let test_parse_wbinfo_uid_info =
           ; uid= 3000003
           ; gid= 3000174
           ; gecos= {|ladmin|}
-          } )
+          }
+      )
     ; ( {|CONNAPP\locked:*:3000004:3000174::/home/CONNAPP/locked:/bin/bash|}
       , Ok
           {user_name= {|CONNAPP\locked|}; uid= 3000004; gid= 3000174; gecos= ""}
@@ -342,7 +345,8 @@ msDS-SupportedEncryptionTypes: 0|}
           ; account_expired= false
           ; account_locked= false
           ; password_expired= false
-          } )
+          }
+      )
     ; ( stdout_locked
       , Ok
           {
@@ -353,7 +357,8 @@ msDS-SupportedEncryptionTypes: 0|}
           ; account_expired= false
           ; account_locked= true
           ; password_expired= false
-          } )
+          }
+      )
     ; ( stdout_expired
       , Ok
           {
@@ -364,7 +369,8 @@ msDS-SupportedEncryptionTypes: 0|}
           ; account_expired= true
           ; account_locked= false
           ; password_expired= false
-          } )
+          }
+      )
     ; ( stdout_krbtgt
       , Ok
           {
@@ -375,10 +381,12 @@ msDS-SupportedEncryptionTypes: 0|}
           ; account_locked= false
           ; account_expired= false
           ; account_disabled= true
-          } )
+          }
+      )
     ; ("Got 0 replies", Error "ldap parsing failed ': got 0 replies'")
     ; ( "complete garbage"
-      , Error "ldap parsing failed 'unexpected header: string'" )
+      , Error "ldap parsing failed 'unexpected header: string'"
+      )
     ]
   in
   matrix |> List.map @@ fun (inp, exp) -> ("<omit inp>", `Quick, check inp exp)
@@ -403,7 +411,8 @@ let test_wbinfo_exception_of_stderr =
     [
       ( "failed to call wbcLookupName: WBC_ERR_DOMAIN_NOT_FOUND\x0ACould not \
          lookup name [email protected]\x0A"
-      , Some (Auth_service_error (E_GENERIC, "WBC_ERR_DOMAIN_NOT_FOUND")) )
+      , Some (Auth_service_error (E_GENERIC, "WBC_ERR_DOMAIN_NOT_FOUND"))
+      )
     ; ("garbage", None)
     ]
   in
@@ -418,5 +427,6 @@ let tests =
   ; ("ADwinbind:test_parse_wbinfo_uid_info", test_parse_wbinfo_uid_info)
   ; ("ADwinbind:test_parse_ldap_stdout", test_parse_ldap_stdout)
   ; ( "ADwinbind:test_wbinfo_exception_of_stderr"
-    , test_wbinfo_exception_of_stderr )
+    , test_wbinfo_exception_of_stderr
+    )
   ]

ocaml/tests/test_xapi_cmd_result.ml

@@ -31,7 +31,8 @@ module XapiCmdResult = Generic.MakeStateless (struct
     `QuickAndAutoDocumented
       [
         ( (':', "Pre-Win2k Domain", "Pre-Win2k Domain: CONNAPP\nsome:other")
-        , Some "CONNAPP" )
+        , Some "CONNAPP"
+        )
       ; ((':', "Pre-Win2k Domain", "Not import msg"), None)
       ]
 end)

ocaml/xapi-cli-server/cli_operations.ml

@@ -7088,15 +7088,10 @@ let subject_add printer rpc session_id params =
   let subject_identifier =
     Client.Auth.get_subject_identifier ~rpc ~session_id ~subject_name
   in
-  (* obtains a list of name-value pairs with info about the subject from the external directory *)
-  let subject_info =
-    Client.Auth.get_subject_information_from_identifier ~rpc ~session_id
-      ~subject_identifier
-  in
-  (* now we've got enough information to create our new subject in the pool *)
+  (* now we've got enough information to create our new subject in the pool
+   * Subject.create will query subject information basing on the subject identifier *)
   let subject_ref =
-    Client.Subject.create ~rpc ~session_id ~subject_identifier
-      ~other_config:subject_info
+    Client.Subject.create ~rpc ~session_id ~subject_identifier ~other_config:[]
   in
   let subject_uuid = Client.Subject.get_uuid rpc session_id subject_ref in
   printer (Cli_printer.PList [subject_uuid])

ocaml/xapi/extauth.ml

@@ -47,7 +47,7 @@ module Ext_auth = struct
     (* the external authentication plugin *)
     | "AD" ->
         (*windows active directory*)
-        Extauth_ad.methods()
+        Extauth_ad.methods ()
     (* if no other auth_type fits, then we don't know what to do *)
     | _ as uat ->
         (*error*)
@@ -87,7 +87,11 @@ let get_event_params ~__context host =
   let service_name =
     Db.Host.get_external_auth_service_name ~__context ~self:host
   in
-  [("auth_type", auth_type); ("service_name", service_name); ("ad_backend", !Xapi_globs.extauth_ad_backend)]
+  [
+    ("auth_type", auth_type)
+  ; ("service_name", service_name)
+  ; ("ad_backend", !Xapi_globs.extauth_ad_backend)
+  ]
 
 (* allows extauth hook script to be called only under specific conditions *)
 let can_execute_extauth_hook_script ~__context host event_name =

ocaml/xapi/extauth_ad.ml

@@ -69,7 +69,7 @@ let init_service ~__context =
   |> AD_type.of_string
   |> AD.init_service ~__context
 
-let methods() =
+let methods () =
   match !Xapi_globs.extauth_ad_backend |> AD_type.of_string with
   | Pbis ->
       Extauth_plugin_ADpbis.AuthADlw.methods

ocaml/xapi/extauth_plugin_ADpbis.ml

@@ -27,7 +27,8 @@ let lwsmd_service = "lwsmd"
 module Lwsmd = struct
   let is_ad_enabled ~__context =
     ( Helpers.get_localhost ~__context |> fun self ->
-      Db.Host.get_external_auth_type ~__context ~self )
+      Db.Host.get_external_auth_type ~__context ~self
+    )
     |> fun x -> x = Xapi_globs.auth_type_AD
 
   let enable_nsswitch () =
@@ -119,7 +120,9 @@ let start_damon () =
     raise
       (Auth_signature.Auth_service_error
          ( Auth_signature.E_GENERIC
-         , Printf.sprintf "Failed to start %s" lwsmd_service ))
+         , Printf.sprintf "Failed to start %s" lwsmd_service
+         )
+      )
 
 module AuthADlw : Auth_signature.AUTH_MODULE = struct
   (*