May 2013 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: re-support broken apache proxy
by yzaslavs＠redhat.com 01 May '13

01 May '13

Yair Zaslavsky has submitted this change and it was merged. Change subject: core: re-support broken apache proxy ...................................................................... core: re-support broken apache proxy apache proxy support was broken in: I37156061cbdd, 'core: i18n splash screen.' The changed cause invalid redirection and the following error message in console log: --- Exception while dispatching incoming RPC call: java.lang.SecurityException: Blocked request without GWT base path header (XSRF attack?) --- Content: 1. Remove unused ovirt-engine.html (what was index.html) as it is superseded by index.jsp 2. Remove redundant welcome directive from web.xml 3. Rename /index.jsp to /ovirt-engine.jsp to be referenced by both apache and jboss. 4. Rename servlet mapping of /index to /ovirt-engine. 5. Modify 404.html pages to redirect to /ovirt-engine instead of /ovirt-engine.html 6. Remove reference of ovirt-engine.html from the proxy. Change-Id: I7ac8feb720d73f0b1107b0bf0908930c525ea542 Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com> --- M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/SplashServlet.java M backend/manager/modules/root/src/main/webapp/404.html R backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml D backend/manager/modules/root/src/main/webapp/ovirt-engine.html M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/SplashServletTest.java M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/404.html M frontend/webadmin/modules/webadmin/src/main/webapp/404.html M packaging/fedora/setup/ovirt-engine-proxy.conf.in 9 files changed, 14 insertions(+), 74 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14304 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ac8feb720d73f0b1107b0bf0908930c525ea542 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: broken unit test
by ecohen＠redhat.com 01 May '13

01 May '13

Einav Cohen has submitted this change and it was merged. Change subject: core: broken unit test ...................................................................... core: broken unit test Fixed a unit test that would break if a file didn't exist in a certain environment. Unit test now creates a file "on the fly" (without writing it to the disk) and uses it rather than relying on a file that may or may not exist on the disk. Change-Id: I9d0627ea770a3194515b22b6d6cc5df5fe8df829 Signed-off-by: Alexander Wels <awels(a)redhat.com> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ServletUtilsTest.java 1 file changed, 24 insertions(+), 6 deletions(-) Approvals: Einav Cohen: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14327 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d0627ea770a3194515b22b6d6cc5df5fe8df829 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Replacing getVds() query by getVdsStatic() query in ...
by mkublin＠redhat.com 01 May '13

01 May '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Replacing getVds() query by getVdsStatic() query in VDSCommands ...................................................................... engine: Replacing getVds() query by getVdsStatic() query in VDSCommands The following patch will replace a getVds() query by getVdsStatic() query in almost all vds (not spm) commands. THe reasons are: 1. A getVds() query - is a query to view, which is based on JOIN from at least 7 tables, getVdsStatic() it is a query to single table, meaning much more faster. 2. VDSStatic object is smaller than VDS object, less resources spent on retrievening it from DB, allocatin memory, etc... 3. VDSStatic object almost never changed, it is means that when it will be cached, we will not perfrom any query during vds commands, the VDS object contains VDSDynamic part, which is changed very frequently, so caching of VDS object is more difficult and possible not efficient. 4. No reason to use VDS object , when we can use VDSStatic object Also patch includes a following fixes and improvements: 1. FullListVDSCommand will never perform a query to vds object, it will be passed via parameters 2. A part of code moved from GetCapabilitiesVDSCommand to CollectVdsNetworkDataVDSCommand, this code is not relevant for GetCapabilitiesVDSCommand and only relevant for CollectVdsNetworkDataVDSCommand 3. Code clean up Also, after applying a patch, a query for VDSStatic will be made only if it is required to log command, and not always in constractor Change-Id: Iff6fa35e25bcd895c25359ece6ba4d5ce9c8e8cf Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FullListVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetCapabilitiesVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStopVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmStatsVdsBrokerCommand.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java 12 files changed, 45 insertions(+), 40 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14321 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff6fa35e25bcd895c25359ece6ba4d5ce9c8e8cf Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Removing date creation from MultipleActionsRunner du...
by mkublin＠redhat.com 01 May '13

01 May '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Removing date creation from MultipleActionsRunner during logging ...................................................................... engine: Removing date creation from MultipleActionsRunner during logging Removed explicity date creation during logging in MultipleActionsRunner. Logger is writting date, so no reason to write by myself Change-Id: Id3d872e3f537be9a099260dd023802be16f7a734 Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14328 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3d872e3f537be9a099260dd023802be16f7a734 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Fixing correlationId in MultipleActionRunner
by mkublin＠redhat.com 01 May '13

01 May '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Fixing correlationId in MultipleActionRunner ...................................................................... engine: Fixing correlationId in MultipleActionRunner The following patch should connect canDoAction with execute part of command by correlationId. >From now, all loggs related to command which was run via MultipleactionRunner will have same correlationId. Removed some code which is checking if command has correlationId as irrelavant Change-Id: I2e0ce3452af69cfde3bc5f6b1075589455ce4cce Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java 3 files changed, 8 insertions(+), 18 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14329 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e0ce3452af69cfde3bc5f6b1075589455ce4cce Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: initVdsOnUp- remove reconstruct and host status.
by mkublin＠redhat.com 01 May '13

01 May '13

Michael Kublin has submitted this change and it was merged. Change subject: core: initVdsOnUp- remove reconstruct and host status. ...................................................................... core: initVdsOnUp- remove reconstruct and host status. *Host that runs through init vds on up shouldn't attempt to reconstruct. *In case of failure during ConnectStoragePool, the host should fail in initalizeStorage() only if the master domain isn't in inactive/ unknown status and the exception wasn't XmlRpcRunTimeException (which is represented by VdcBllErrors.VDS_NETWORK_ERROR. Change-Id: I6418b9d2826146e1e4ceff4341c6d7cd3a0024af Signed-off-by: Liron Aravot <laravot(a)redhat.com> --- M backend/manager/dbscripts/storages_sp.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java 5 files changed, 63 insertions(+), 24 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved Liron Ar: Verified -- To view, visit http://gerrit.ovirt.org/13709 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6418b9d2826146e1e4ceff4341c6d7cd3a0024af Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: initialize vds - select random host
by mkublin＠redhat.com 01 May '13

01 May '13

Michael Kublin has submitted this change and it was merged. Change subject: core: initialize vds - select random host ...................................................................... core: initialize vds - select random host when attempting to initialize vds, attempt to perform it through random host to not try always through the same one. Change-Id: If636850ba7d13b9a0be146059a9a964bb881abde Signed-off-by: Liron Aravot <laravot(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved Liron Ar: Verified -- To view, visit http://gerrit.ovirt.org/13881 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If636850ba7d13b9a0be146059a9a964bb881abde Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>

1 0

Change in ovirt-engine[master]: findbugs: revert unnecessary Serializable
by mpastern＠redhat.com 01 May '13

01 May '13

Michael Pasternak has submitted this change and it was merged. Change subject: findbugs: revert unnecessary Serializable ...................................................................... findbugs: revert unnecessary Serializable patch http://gerrit.ovirt.org/#/c/13993/ added Serializable to BackendAssignedPermissionsResource by mistake, this patch remove it. Change-Id: I659aa7f13b51a2c94dbf53f70704014a183ed0d7 Signed-off-by: Shahar Havivi <shavivi(a)redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Michael Pasternak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14365 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I659aa7f13b51a2c94dbf53f70704014a183ed0d7 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>

1 0

Change in ovirt-engine[master]: core:ovirt-engine-backend: engine.log is flooded..
by yzaslavs＠redhat.com 01 May '13

01 May '13

Yair Zaslavsky has submitted this change and it was merged. Change subject: core:ovirt-engine-backend: engine.log is flooded.. ...................................................................... core:ovirt-engine-backend: engine.log is flooded.. ovirt-engine-backend: engine.log is flooded by Failed to decrypt Data Excluding the key store password (keystorePass) out of the list, so it will not be encrypted. Change-Id: Ife6005688a06d62a740970ea14b617010d6b9b2d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=880978 Signed-off-by: Eli Mesika <emesika(a)redhat.com> --- M backend/manager/dbscripts/encryptionvalidator.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alon Bar-Lev: Looks good to me, but someone else must approve Eli Mesika: Verified Yair Zaslavsky: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14364 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6005688a06d62a740970ea14b617010d6b9b2d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine-cli[master]: cli: prepare for the next development iteration
by mpastern＠redhat.com 01 May '13

01 May '13

Michael Pasternak has submitted this change and it was merged. Change subject: cli: prepare for the next development iteration ...................................................................... cli: prepare for the next development iteration Change-Id: Ia2748b9b417921a65e41268bbc0abc8c0274f507 Signed-off-by: Michael pasternak <mpastern(a)redhat.com> --- M Makefile M setup.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Michael Pasternak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14362 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2748b9b417921a65e41268bbc0abc8c0274f507 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-cli Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <mpastern(a)redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>

1 0