Skip to content

Commit a32456d

Browse files
committed
CA-264331: Remove unused shutdown ack timeout setting
This setting was previously configurable from the `xapi.conf` file, when xenopsd was still a part of xapi. When they split, the setting was not transferred and nor was it wired up to be used by xenopsd. This commit removes the setting from xapi. A corresponding commit in xenopsd adds it there and makes it configurable in `xenopsd.conf`. Signed-off-by: Frederico Mazzone <[email protected]>
1 parent ecf07d8 commit a32456d

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

ocaml/xapi/xapi_globs.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@ let pool_db_sync_interval = ref 300.
645645
(* blob/message/rrd file syncing - sync once a day *)
646646
let pool_data_sync_interval = ref 86400.
647647

648-
let domain_shutdown_ack_timeout = ref 10.
649648
let domain_shutdown_total_timeout = ref 1200.
650649

651650
(* The actual reboot delay will be a random value between base and base + extra *)
@@ -827,7 +826,6 @@ let xapi_globs_spec =
827826
"pif_reconfigure_ip_timeout", Float pif_reconfigure_ip_timeout;
828827
"pool_db_sync_interval", Float pool_db_sync_interval;
829828
"pool_data_sync_interval", Float pool_data_sync_interval;
830-
"domain_shutdown_ack_timeout", Float domain_shutdown_ack_timeout;
831829
"domain_shutdown_total_timeout", Float domain_shutdown_total_timeout;
832830
"emergency_reboot_delay_base", Float emergency_reboot_delay_base;
833831
"emergency_reboot_delay_extra", Float emergency_reboot_delay_extra;

scripts/xapi.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,6 @@ sm-plugins=ext nfs iscsi lvmoiscsi dummy file hba rawhba udev iso lvm lvmohba lv
245245
# hosts
246246
# pool_data_sync_interval = 86400 # a day in seconds
247247

248-
# time to wait for in-guest PV drivers to acknowledge a shutdown request
249-
# before we conclude that the drivers have failed
250-
# domain_shutdown_ack_timeout = 10
251-
252248
# time to wait for a domain to shutdown before we conclude the operation
253249
# has failed. Note it can take a long time to shutdown if (for example)
254250
# the OS has decided to install a large set of patches.

0 commit comments

Comments
 (0)