Change in ovirt-engine[ovirt-engine-3.6]: core: Import graphics devices from hosted engine VM
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: Import graphics devices from hosted engine VM
......................................................................
core: Import graphics devices from hosted engine VM
When importing the hosted engine VM we now import the Graphics devices
(SPICE, VNC). Previously they were ignored because they never get an
address property.
Change-Id: I3a405df759b4c2fc624e79deb62aa39c5ac4d8e5
Bug-Url: https://bugzilla.redhat.com/1326810
Bug-Url: https://bugzilla.redhat.com/1328921
Signed-off-by: Roman Mohr <rmohr(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VmsMonitoringTest.java
A backend/manager/modules/vdsbroker/src/test/resources/external_vm.json
A backend/manager/modules/vdsbroker/src/test/resources/he_vm.json
A backend/manager/modules/vdsbroker/src/test/resources/internal_vm.json
5 files changed, 924 insertions(+), 109 deletions(-)
Approvals:
Roman Mohr: Verified
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
Michal Skrivanek: Looks good to me, but someone else must approve
Arik Hadas: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/57298
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a405df759b4c2fc624e79deb62aa39c5ac4d8e5
Gerrit-PatchSet: 17
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: core: Import graphics devices from externally managed VMs
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: Import graphics devices from externally managed VMs
......................................................................
core: Import graphics devices from externally managed VMs
When importing the hosted engine VM or other external VMs we now import
the Graphics device (SPICE, VNC). Previously they were ignored because
they never get an address property.
Change-Id: I3a405df759b4c2fc624e79deb62aa39c5ac4d8e5
Bug-Url: https://bugzilla.redhat.com/1326810
Bug-Url: https://bugzilla.redhat.com/1328921
Signed-off-by: Roman Mohr <rmohr(a)redhat.com>
(cherry picked from commit 2647308822a84d2938d035d7471bf178e8c22d0b)
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommand.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommandTest.java
A backend/manager/modules/bll/src/test/resources/external_vm.json
A backend/manager/modules/bll/src/test/resources/he_vm.json
4 files changed, 685 insertions(+), 28 deletions(-)
Approvals:
Roman Mohr: Verified
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
Arik Hadas: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/58255
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a405df759b4c2fc624e79deb62aa39c5ac4d8e5
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: webadmin: Adding left panel to Add/Install host for HE
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: webadmin: Adding left panel to Add/Install host for HE
......................................................................
webadmin: Adding left panel to Add/Install host for HE
Supply the user with options to deploy,undeploy or noop for the hosted
engine components of the host.
For simplicity the panel will contain 3 radio buttons: 'None', 'Deploy',
'Undeploy' under the left panel named 'Hosted Engine'
Wiki page: http://www.ovirt.org/develop/release-management/features/hosted-engine-ad...
Change-Id: Id697fd68ee9a3920cf0190a8c6202cd03cd88690
Bug-Url: https://bugzilla.redhat.com/1167262
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
---
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelRadioGroupEditor.java
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/TabName.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostedEngineHostModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
19 files changed, 148 insertions(+), 7 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Daniel Erez: Looks good to me, approved
Roy Golan: Verified
--
To view, visit https://gerrit.ovirt.org/58264
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id697fd68ee9a3920cf0190a8c6202cd03cd88690
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: restapi: Support host install/reinstall of HE
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: restapi: Support host install/reinstall of HE
......................................................................
restapi: Support host install/reinstall of HE
Expose 2 matrix parameters when adding/installing a host:
- POST api/hosts;deploy_hosted_engine
will pass a DEPLOY action to the underlying installation and if there
is a hosted engine setup that will deploy the host as part of the
hosted engine HA cluster.
- POST api/hosts;undeploy_hosted_engine
Essentially removing the hosted engine HA component and removing this
host from the HA cluster. i.e it will not run the hosted engine
anymore.
Change-Id: Ib2f851f4fec582506f3a3df07407d62385cb9a87
Bug-Url: https://bugzilla.redhat.com/1167262
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
Depends-On: https://gerrit.ovirt.org/55920
---
M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostResourceParametersUtil.java
4 files changed, 55 insertions(+), 0 deletions(-)
Approvals:
Juan Hernandez: Looks good to me, approved
Jenkins CI: Passed CI tests
Roy Golan: Verified
--
To view, visit https://gerrit.ovirt.org/58263
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2f851f4fec582506f3a3df07407d62385cb9a87
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: core: Make the download size of HE config disk configurable
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: Make the download size of HE config disk configurable
......................................................................
core: Make the download size of HE config disk configurable
The size of the config disk to download is configurable and can be
changed depending underlying storage infra. Since the config tar doesn't
occupy the 'real' disk size that is reported we can safely download the
exact section that holds the tar image.
TODO the size of the tar should be parsed from the description, much
like it is used today for OVF disks. See
https://bugzilla.redhat.com/show_bug.cgi?id=1336655
Change-Id: I7541c8372b044370346e20127ebca434a9245781
Bug-Url: https://bugzilla.redhat.com/1167262
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineConfigFetcher.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineConfigFetcherTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
M packaging/etc/engine-config/engine-config.properties
5 files changed, 20 insertions(+), 2 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Roy Golan: Verified
Arik Hadas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/58262
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7541c8372b044370346e20127ebca434a9245781
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[master]: core: GetDiskAlignmentCommandTest type inference
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: GetDiskAlignmentCommandTest type inference
......................................................................
core: GetDiskAlignmentCommandTest type inference
Change-Id: I0f5f904e9e9992d41b508da22dc574690d6d173c
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAlignmentCommandTest.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/58412
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f5f904e9e9992d41b508da22dc574690d6d173c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[master]: core: GetDiskAlignmentCommandTest members
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: GetDiskAlignmentCommandTest members
......................................................................
core: GetDiskAlignmentCommandTest members
Reduce members scope and convert them to local variables where possible
in order to make the code easier to read.
Change-Id: I3238bd6a9662550197c0b1927c51cf4143ae1ecb
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAlignmentCommandTest.java
1 file changed, 7 insertions(+), 14 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/58413
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3238bd6a9662550197c0b1927c51cf4143ae1ecb
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[master]: core: GetDiskAlignmentCommandTest collections
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: GetDiskAlignmentCommandTest collections
......................................................................
core: GetDiskAlignmentCommandTest collections
Use Collections#singletonList instead of Arrays.asList with a
single-element array to improve performance.
Change-Id: Ic45c78a0188a9412149b9622e849cd6ca917dff5
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAlignmentCommandTest.java
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/58414
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic45c78a0188a9412149b9622e849cd6ca917dff5
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: host-deploy: Support deploying Hosted Engine components
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: host-deploy: Support deploying Hosted Engine components
......................................................................
host-deploy: Support deploying Hosted Engine components
Till today a hosts with hosted engine components were added manually by
script on the hosts themselves. This patch will enable to install and
configure the relevant components by passing all the relevant
information from the engine.
The prerequisite for that is to have the hosted engine VM imported into
the engine. Otherwise we can't gather all the info for the installation.
So now a user can select to Deploy/Remove hosted engine agent or leave with no change(see Action)
In order to deploy an additional Hosted Engine host we need to provide
the configuration that was used by the 1st host and just assign it with
a differnt unique host_id. For that we download the configuration from a
special disk on the special domain and extract the configuration from
it. This behaviour is composed under the HostedEngineConfigFetcher.java
utility.
Wiki:
http://www.ovirt.org/develop/release-management/features/hosted-engine-ad...
Change-Id: I535bdfeba41b03c86520408e72abfa914fe3e1be
Bug-Url: https://bugzilla.redhat.com/1167262
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommand.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/VdsDeployHostedEngineUnit.java
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineConfigFetcher.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostValidator.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineConfigFetcherTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/HostValidatorTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
A backend/manager/modules/bll/src/test/resources/hosted-engine-config.tar
A backend/manager/modules/bll/src/test/resources/hosted-engine.conf
A backend/manager/modules/bll/src/test/resources/not-a-valid-hosted-engine-config-tar.tar
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/hostdeploy/InstallVdsParameters.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostedEngineDeployConfiguration.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
20 files changed, 771 insertions(+), 158 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Roy Golan: Verified
Moti Asayag: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/58261
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I535bdfeba41b03c86520408e72abfa914fe3e1be
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months
Change in ovirt-engine[ovirt-engine-4.0]: core: Avoid an infinite loop when untar an entry
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Avoid an infinite loop when untar an entry
......................................................................
core: Avoid an infinite loop when untar an entry
Avoid going into infinite loop in case there is an error during an entry
extraction from a tar archive.
For example if the tar contains a corrupted or simply an empty file,
this will trigger the infinite loop. The fix will just skip to the next
entry and will add empty files into the archive (we reflect the tar
entries and not ignoring them)
Change-Id: I64a8d019cb5c13df19ee21eecb2ab81b42a9b3cc
Bug-Url: https://bugzilla.redhat.com/1167262
Signed-off-by: Roy Golan <rgolan(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OvfUtils.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/TarInMemoryExport.java
A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarInMemoryExportTest.java
A backend/manager/modules/utils/src/test/resources/mixed-content.tar
A backend/manager/modules/utils/src/test/resources/non-empty.tar
A backend/manager/modules/utils/src/test/resources/tar-with-empty-file.tar
6 files changed, 83 insertions(+), 7 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Roy Golan: Verified
Maor Lipchuk: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/58343
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64a8d019cb5c13df19ee21eecb2ab81b42a9b3cc
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
7 years, 10 months