Change in ovirt-engine[master]: build: add EXTRA_BUILD_FLAGS make variable
by oschreib＠redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: build: add EXTRA_BUILD_FLAGS make variable
......................................................................
build: add EXTRA_BUILD_FLAGS make variable
This optional trivial patch enables build system to pass some
misc maven flags to effect all maven usages, without effecting
the Makefile targets specified at BUILD_FLAGS and subject to
change.
For example, it useful to add "-Dgwt.userAgent=XXX" by build
script without losing the current build settings.
Change-Id: I87a81f08820e80cc09b20478dffc7b4e1c5fa554
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M Makefile
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6054
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87a81f08820e80cc09b20478dffc7b4e1c5fa554
Gerrit-PatchSet: 5
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: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: Simplify use of generics to avoid cobertura bug
by lhornyak＠redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Simplify use of generics to avoid cobertura bug
......................................................................
core: Simplify use of generics to avoid cobertura bug
The use of nested generic types as method return types seems to
trigger a bug in cobertura. First detected case is the following
line in DBConfigUtils:
return this.<Map<?, ?>> GetValue(...);
It generates the following error:
"org.ovirt.engine.core.dal.dbbroker.generic.DBConfigUtils.GetValue(DataType,String,String)"
[cobertura-report] Encountered " "?" "? "" at line 239, column 30.
[cobertura-report] Was expecting one of:
[cobertura-report] "assert" ...
[cobertura-report] "boolean" ...
...
In this particular case we can remove that line without affecting
the rest of the code.
Change-Id: Ie29ff2a0314713a7c49fd3c9fee0b909ad0553f8
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
1 file changed, 3 insertions(+), 14 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4902
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie29ff2a0314713a7c49fd3c9fee0b909ad0553f8
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: Run upgradeStoragePool on cluster compatibility change
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: Run upgradeStoragePool on cluster compatibility change
......................................................................
core: Run upgradeStoragePool on cluster compatibility change
This will cause a pool to upgrade when the compatibility version is
raised appropriately.
The domains are marked as updated in the DB even though it might take
some time untill they are actually updated. This is OK as VDSM will
update them as long as they are accessed with the correct storage format
type.
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: I85201624bbb2f8c41cf3b184b89a8e199ff50e99
---
M backend/manager/dbscripts/storages_sp.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java
A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpgradeStoragePoolVDSCommand.java
9 files changed, 143 insertions(+), 9 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/2441
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85201624bbb2f8c41cf3b184b89a8e199ff50e99
Gerrit-PatchSet: 20
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: Add storage_format_type to Updatestorage_domain_static
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: Add storage_format_type to Updatestorage_domain_static
......................................................................
core: Add storage_format_type to Updatestorage_domain_static
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: Ifc51ee4a527339e223cf852c85d144f63b60fe09
---
M backend/manager/dbscripts/storages_sp.sql
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/2440
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc51ee4a527339e223cf852c85d144f63b60fe09
Gerrit-PatchSet: 16
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: Use the hostSpmId during reconstructMaster
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: Use the hostSpmId during reconstructMaster
......................................................................
core: Use the hostSpmId during reconstructMaster
In this patch:
* disconnectStoragePool before reconstructMaster only when the storage
format is V1 or V2
* Use the additional parameter spmHostId for reconstructMaster (this is
accepted and ignored by old VDSM versions as the "options" parameter)
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: Id8c4fceeda898e020a4153ccd36aa078eb200ac3
---
M backend/manager/dbscripts/upgrade/pre_upgrade/config.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.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/ReconstructMasterVDSCommand.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
11 files changed, 59 insertions(+), 27 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4967
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8c4fceeda898e020a4153ccd36aa078eb200ac3
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: restapi: UnPowerMock BackendCapabilitiesResourceTest
by lhornyak＠redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: restapi: UnPowerMock BackendCapabilitiesResourceTest
......................................................................
restapi: UnPowerMock BackendCapabilitiesResourceTest
Removed PowerMock references from BackendCapabilityResourceTest.
PowerMock was used to create a static mock for Config , but it was never
used since the test instead mocked the GetConfigValueQuery class, so it
could simply be removed without loosing any functionality in the test.
Change-Id: Iea3ea74b97babc1e3778c138438128c23e7fc794
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java
1 file changed, 48 insertions(+), 46 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6101
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea3ea74b97babc1e3778c138438128c23e7fc794
Gerrit-PatchSet: 3
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: restapi: UnPowerMock BackendCapabilitiesResourceTest
by lhornyak＠redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: restapi: UnPowerMock BackendCapabilitiesResourceTest
......................................................................
restapi: UnPowerMock BackendCapabilitiesResourceTest
Removed PowerMock references from BackendCapabilitiesResourceTest.
PowerMock was used to create a static mock for Config , but it was never
used since the test instead mocked the GetConfigValueQuery class, so it
could simply be removed without loosing any functionality in the test.
Change-Id: I44f219b02c7bf3c2eed5c5bd2693cef4d73599d6
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
1 file changed, 42 insertions(+), 39 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6100
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44f219b02c7bf3c2eed5c5bd2693cef4d73599d6
Gerrit-PatchSet: 3
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: initial ReconstructMasterDomain refactoring
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: initial ReconstructMasterDomain refactoring
......................................................................
core: initial ReconstructMasterDomain refactoring
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: I79fdcf9870a003fc79e273a6fc89351e3dad5b5c
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/HandleFailedStorageDomainCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ReconstructMasterParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/StorageDomainPoolParametersBase.java
5 files changed, 81 insertions(+), 93 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5329
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79fdcf9870a003fc79e273a6fc89351e3dad5b5c
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: setup: test effective user id instead of 'root' user name
by oschreib＠redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: setup: test effective user id instead of 'root' user name
......................................................................
setup: test effective user id instead of 'root' user name
Root user or every other alias will have UID=0, better
test for UID and not user name.
In bash we have $UID, $EUID.
In POSIX sh we have $(id -u).
In Python, there is no need to convert uid to name in order
to test if we run under root.
Change-Id: Iad84de5277439b2a1aac7b5985954c1ad8ffca80
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M backend/manager/dbscripts/engine-db-install.sh
M packaging/fedora/setup/engine-cleanup.py
M packaging/fedora/setup/engine-upgrade.py
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6051
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad84de5277439b2a1aac7b5985954c1ad8ffca80
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
12 years, 4 months
Change in ovirt-engine[master]: core: Fixing ResourceManager
by rgolan＠redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: core: Fixing ResourceManager
......................................................................
core: Fixing ResourceManager
This patch fixes usage of map - instead of contains,
it should use containsKey
Change-Id: Iaa00d08fb3a19a4edc79a893c80afa62cdd1b676
Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Roy Golan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6130
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa00d08fb3a19a4edc79a893c80afa62cdd1b676
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
12 years, 4 months