Change in ovirt-engine[master]: engine: Fixing RecoveryStoragePool and EventQueue
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: engine: Fixing RecoveryStoragePool and EventQueue
......................................................................
engine: Fixing RecoveryStoragePool and EventQueue
The following fix is doing the following:
1. The event trigerred by RecoveryStoragePoll will be cleaned from queue if a previous
event was reconstruct and it finished with success
2. The event of RecoveryStoragePool will be added the first to the queue, because of it was
triggered by user
3. Removed a code from RecoveryStoragePool which should prevent a race, the reason is no race is prevented,
code was duplicated, the logic was duplicated, the logic should be simple and rewritted in other way
Change-Id: I3b58f095c69c76116f0af44b08ccaf41d1ff1fb8
Signed-off-by: Michael Kublin <mkublin(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
2 files changed, 39 insertions(+), 36 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11201
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b58f095c69c76116f0af44b08ccaf41d1ff1fb8
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkublin(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 Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: engine: Making increase of storage pool master domain versio...
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: engine: Making increase of storage pool master domain version atomic operation
......................................................................
engine: Making increase of storage pool master domain version atomic operation
The following patch should make an increase of master storage domain version atomic
operation. This is done in order to prevent races and need for cache reload and also to
make code simple
Change-Id: Iaa2657ddfdbf2400f24341b07ab60743d6430481
Signed-off-by: Michael Kublin <mkublin(a)redhat.com>
---
M backend/manager/dbscripts/storages_sp.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java
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/RecoveryStoragePoolCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/SimpleJdbcCallsHandler.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAO.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java
10 files changed, 51 insertions(+), 18 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11500
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa2657ddfdbf2400f24341b07ab60743d6430481
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: Don't use StringHelper in bll package
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Don't use StringHelper in bll package
......................................................................
core: Don't use StringHelper in bll package
Remove the last leftovers of the deprecated StringHelper usages from the
bll package and replace them with apache's standard StringUtils.
Change-Id: Ie7daf463174660d063a9da2c7bbf20b4ad2389ec
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
12 files changed, 34 insertions(+), 41 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11633
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7daf463174660d063a9da2c7bbf20b4ad2389ec
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: Don't use StringHelper in the utils package
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Don't use StringHelper in the utils package
......................................................................
core: Don't use StringHelper in the utils package
Remove the last leftovers of the deprecated StringHelper usages from the
utils package and replace them with standard JDK and apache commons'
StringUtils calls.
Change-Id: Ie2d43509711201472c8607e7b638efb55b90e4d7
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
5 files changed, 60 insertions(+), 60 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11632
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2d43509711201472c8607e7b638efb55b90e4d7
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: Don't use StringHelper in vdsbroker package
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Don't use StringHelper in vdsbroker package
......................................................................
core: Don't use StringHelper in vdsbroker package
Remove the last leftovers of the deprecated StringHelper usages from the
vdsbroker package and replace them with apache's standard StringUtils.
Change-Id: I78eb31461c5fbe5350279d4641c3f85294f30331
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
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/irsbroker/UpdateVMVDSCommand.java
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11631
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78eb31461c5fbe5350279d4641c3f85294f30331
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: Remove LdapIsComputerWithTheSameNameExists
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Remove LdapIsComputerWithTheSameNameExists
......................................................................
core: Remove LdapIsComputerWithTheSameNameExists
This command is just dead code - its executeQuery() method is
completely commented out, and it has no entry in VdcActionType, so
there is no way of calling it.
Change-Id: Id8db1e4174922d353ebcc1fc415b677e8ec69930
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapIsComputerWithTheSameNameExistsCommand.java
1 file changed, 0 insertions(+), 54 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11630
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8db1e4174922d353ebcc1fc415b677e8ec69930
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: engine: fix locking issue in GlusterMultipleActionsRunner
by sanjal＠redhat.com
Shireesh Anjal has submitted this change and it was merged.
Change subject: engine: fix locking issue in GlusterMultipleActionsRunner
......................................................................
engine: fix locking issue in GlusterMultipleActionsRunner
GlusterMultipleActionsRunner#executeValidatedCommands() had code to
re-acquire the lock released at the end of canDoAction. However, this
should not happen in case the CanDoAction had failed, as
MultipleActionsRunner#executeValidatedCommand() doesn't even execute
the command in this case.
Performed a minor refactoring in MultipleActionsRunner as follows:
- renamed executeValidatedCommands() to executeValidatedCommand()
- executeValidatedCommand() gets called only when canDoAction was success
Change-Id: I100603d7155deb67bb2f0a8b451732a0003fbf55
Bug-Url: https://bugzilla.redhat.com/905904
Signed-off-by: Shireesh Anjal <sanjal(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GlusterMultipleActionsRunner.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/storage/AttachStorageDomainsMultipleActionRunner.java
3 files changed, 21 insertions(+), 20 deletions(-)
Approvals:
Shireesh Anjal: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11597
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I100603d7155deb67bb2f0a8b451732a0003fbf55
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <sanjal(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: Remove AuditLogableBaseMockUtils
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Remove AuditLogableBaseMockUtils
......................................................................
core: Remove AuditLogableBaseMockUtils
AuditLogableBaseMockUtils was used to mock VmDAO in tests for bll
commands. since this can now be done directly, this class is not longer
required.
Change-Id: Ib44258e3679ef3cd1d05aa4326ec09fff4c9d2bd
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseMockUtils.java
15 files changed, 17 insertions(+), 55 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib44258e3679ef3cd1d05aa4326ec09fff4c9d2bd
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(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>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months
Change in ovirt-engine[master]: core: RemoveStorageDomainTest: simplify msg check
by amureini＠redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: RemoveStorageDomainTest: simplify msg check
......................................................................
core: RemoveStorageDomainTest: simplify msg check
Simplified the way canDoAction messages are asserted in the test.
Change-Id: I134240763353c88d14948bea535e362c3db42fd1
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11607
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I134240763353c88d14948bea535e362c3db42fd1
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>
Gerrit-Reviewer: liron aravot <liron.aravot(a)gmail.com>
11 years, 10 months
Change in ovirt-engine[master]: cleanup: update .gitignore
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: cleanup: update .gitignore
......................................................................
cleanup: update .gitignore
1. python objects.
2. build generated files.
Change-Id: Ie766950c96bfb36f210e9792437adc5b9c326693
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M .gitignore
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/11570
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie766950c96bfb36f210e9792437adc5b9c326693
Gerrit-PatchSet: 2
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: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
11 years, 10 months