Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: increasing vdscli SSL timeout ......................................................................
packaging: setup: increasing vdscli SSL timeout Increasing vdscli SSL timeout from default value (60 seconds) to 180 seconds in order to prevent SSL timeout errors on slow storage operations. Change-Id: I09f758d7521d1d94d0ed757fac926a3f14b7f0c2 Bug-Url: https://bugzilla.redhat.com/1169290 Signed-off-by: Simone Tiraboschi <[email protected]> --- M ovirt-hosted-engine-setup.spec.in M src/ovirt_hosted_engine_setup/constants.py M src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py 3 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/61/38961/1 diff --git a/ovirt-hosted-engine-setup.spec.in b/ovirt-hosted-engine-setup.spec.in index a820238..fce6fb0 100644 --- a/ovirt-hosted-engine-setup.spec.in +++ b/ovirt-hosted-engine-setup.spec.in @@ -40,7 +40,7 @@ Requires: python-ethtool >= 0.6-3 Requires: otopi >= 1.3.1 Requires: vdsm >= 4.16.10 -Requires: vdsm-cli >= 4.16.10 +Requires: vdsm-cli >= 4.16.11 Requires: vdsm-python >= 4.16.10 Requires: ovirt-host-deploy >= 1.3.1 Requires: openssh-server diff --git a/src/ovirt_hosted_engine_setup/constants.py b/src/ovirt_hosted_engine_setup/constants.py index 1af24b6..677c566 100644 --- a/src/ovirt_hosted_engine_setup/constants.py +++ b/src/ovirt_hosted_engine_setup/constants.py @@ -289,6 +289,7 @@ HA_NOTIF_SMTP_SOURCE_EMAIL = 'source-email' HA_NOTIF_SMTP_DEST_EMAILS = 'destination-emails' BLANK_UUID = '00000000-0000-0000-0000-000000000000' + VDSCLI_SSL_TIMEOUT = 180 @util.export diff --git a/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py b/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py index 59db87b..3a114f8 100644 --- a/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py +++ b/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py @@ -69,7 +69,7 @@ hostPort = vdscli.cannonizeHostPort('localhost') serv.do_connect(hostPort) - cli = vdscli.connect() + cli = vdscli.connect(timeout=ohostedcons.Const.VDSCLI_SSL_TIMEOUT) self.environment[ohostedcons.VDSMEnv.VDS_CLI] = cli self.environment[ohostedcons.VDSMEnv.VDS_CLIENT] = serv -- To view, visit https://gerrit.ovirt.org/38961 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09f758d7521d1d94d0ed757fac926a3f14b7f0c2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: ovirt-hosted-engine-setup-1.2 Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
