- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: backend: Fix NPE in decreasePendingVm()
by ofrenkel＠redhat.com 03 Aug '15

03 Aug '15

Omer Frenkel has submitted this change and it was merged. Change subject: backend: Fix NPE in decreasePendingVm() ...................................................................... backend: Fix NPE in decreasePendingVm() DecreasePendingVm() was called from runningFailed() method after getVdsToRunOn() returned null which resulted in getBlockingQueue() being called with null `vdsId`. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1243811 Change-Id: If7342c2b432ff4e71d6e5261e4f0fdd4ea49edbe Signed-off-by: Martin Betak <mbetak(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Martin Betak: Verified Roy Golan: Looks good to me, but someone else must approve Omer Frenkel: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/44243 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7342c2b432ff4e71d6e5261e4f0fdd4ea49edbe Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: remove unneeded override of hasTasks method
by ahadas＠redhat.com 03 Aug '15

03 Aug '15

Arik Hadas has submitted this change and it was merged. Change subject: core: remove unneeded override of hasTasks method ...................................................................... core: remove unneeded override of hasTasks method Remove ConvertVmCommand#hasTasks since we now check that the callback is not null in order to determine whether the command is async or not so there is no need to override the 'hasTasks' method anymore. Change-Id: Ieb37618de0ce273c0480e42247aa00849d81f6e0 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ConvertVmCommand.java 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins CI: Passed CI tests Omer Frenkel: Looks good to me, approved Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/44291 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb37618de0ce273c0480e42247aa00849d81f6e0 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-live[master]: build: post ovirt-live-3.6.0_beta1
by sbonazzo＠redhat.com 03 Aug '15

03 Aug '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: build: post ovirt-live-3.6.0_beta1 ...................................................................... build: post ovirt-live-3.6.0_beta1 Change-Id: Ie21d9241ff1a96a59b298b773028a356e92baf4f Signed-Of-By: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M centos-7/Makefile M centos-7/kickstart/ovirt-live-ovirt-custom.ks.in 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/44309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie21d9241ff1a96a59b298b773028a356e92baf4f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: Console options is not disabled in vm multiple selection
by shavivi＠redhat.com 03 Aug '15

03 Aug '15

Shahar Havivi has submitted this change and it was merged. Change subject: Console options is not disabled in vm multiple selection ...................................................................... Console options is not disabled in vm multiple selection Console options needs to be enabled only for a single VM and not for multiple VMs selections. Change-Id: Iba2c021283f9ae63720f6ab8309b649c967dbcf4 Bug-Url: https://bugzilla.redhat.com/1217446 Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tomas Jelinek: Looks good to me, approved Shahar Havivi: Verified Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/43934 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba2c021283f9ae63720f6ab8309b649c967dbcf4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-live[master]: build: ovirt-live-3.6.0_beta1
by sbonazzo＠redhat.com 03 Aug '15

03 Aug '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: build: ovirt-live-3.6.0_beta1 ...................................................................... build: ovirt-live-3.6.0_beta1 Change-Id: I0a623e77c8fbc8e2c9486d7fafa9b16573308a1c Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M centos-7/Makefile M centos-7/kickstart/ovirt-live-ovirt-custom.ks.in 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/44308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a623e77c8fbc8e2c9486d7fafa9b16573308a1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: VDSParametersBase#toString()
by amureini＠redhat.com 03 Aug '15

03 Aug '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: VDSParametersBase#toString() ...................................................................... core: VDSParametersBase#toString() Patch 5c3a65a53664e138be3d6712ba58ae852dcfd1ba introduced a standard way to produce toString()s in VDSParametersBase's extending classes, but did not force the extending classes to use it. This patch finishes the job by fixing the other parameter classes that were added after this patch and defining the toString() as final so that future classes could not override this standard behavior. Note: This patch fixes Coverity CID 1312029. Change-Id: I0f75c8c2f74235854ae81a2653f95e2911b47095 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyVolumeDataVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVolumeVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostSetupNetworksVdsCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResizeStorageDomainPVVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainVdsCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetNumberOfCpusVDSCommand.java 7 files changed, 33 insertions(+), 38 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Martin Peřina: Looks good to me, but someone else must approve Allon Mureinik: Verified; Passed CI tests Moti Asayag: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/44191 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f75c8c2f74235854ae81a2653f95e2911b47095 Gerrit-PatchSet: 5 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: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-hosted-engine-setup[master]: packaging: setup: avoid assumption on answerfile
by sbonazzo＠redhat.com 03 Aug '15

03 Aug '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: avoid assumption on answerfile ...................................................................... packaging: setup: avoid assumption on answerfile Avoid assuming that the CLI added answerfile was by sure correctly and completely generated on the first host. Node is always appending a partial answerfile. Change-Id: Icf4a31fbc658fcb5fe1036be0c67aac9685905ae Bug-Url: https://bugzilla.redhat.com/1249118 Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com> --- M src/plugins/ovirt-hosted-engine-setup/core/remote_answerfile.py 1 file changed, 37 insertions(+), 16 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, approved Simone Tiraboschi: Verified Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/44161 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf4a31fbc658fcb5fe1036be0c67aac9685905ae Gerrit-PatchSet: 4 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Fabian Deutsch <fabiand(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Lev Veyde <lveyde(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: packaging: setup: vmconsole: cleanup config module
by sbonazzo＠redhat.com 03 Aug '15

03 Aug '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: vmconsole: cleanup config module ...................................................................... packaging: setup: vmconsole: cleanup config module add devenv specific notes to README.developer, remove from runtime. a config file that can be processed using a template during build time should not be generated at runtime. remove unused Makefile substitutions. use better naming for vmconsole proxy configuration we provide. Change-Id: I4605019e7430cc28e6be2d0eea3ca41503f7bff3 Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M .gitignore M Makefile M README.developer M ovirt-engine.spec.in A packaging/conf/ovirt-vmconsole-proxy.conf.in M packaging/setup/ovirt_engine_setup/vmconsole_proxy_helper/config.py.in M packaging/setup/ovirt_engine_setup/vmconsole_proxy_helper/constants.py M packaging/setup/plugins/ovirt-engine-setup/vmconsole_proxy_helper/config.py 8 files changed, 42 insertions(+), 97 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, approved Jenkins CI: Passed CI tests Francesco Romani: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/44174 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4605019e7430cc28e6be2d0eea3ca41503f7bff3 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: rename var to fit the declared type
by rgolan＠redhat.com 03 Aug '15

03 Aug '15

Roy Golan has submitted this change and it was merged. Change subject: core: rename var to fit the declared type ...................................................................... core: rename var to fit the declared type Change-Id: I3e6416515682f6ac15378db8b628306c8a1dcafa Signed-off-by: Roy Golan <rgolan(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java 1 file changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Verified Omer Frenkel: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/37692 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e6416515682f6ac15378db8b628306c8a1dcafa Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: convert virtual appliance - vdsbroker
by ahadas＠redhat.com 03 Aug '15

03 Aug '15

Arik Hadas has submitted this change and it was merged. Change subject: core: convert virtual appliance - vdsbroker ...................................................................... core: convert virtual appliance - vdsbroker Change-Id: I2736af9440b2bcd5f5069282fc4b424ad83a6487 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertOvaVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConvertOvaVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 7 files changed, 183 insertions(+), 1 deletion(-) Approvals: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/44129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2736af9440b2bcd5f5069282fc4b424ad83a6487 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0