Alon Bar-Lev has posted comments on this change.
Change subject: engine:changed AddVdsCommand to use LockManager properly
......................................................................
Patch Set 2:
(1 comment)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
Line 573: protected Map<String, Pair<String, String>> getExclusiveLocks() {
Line 574: VDSGroup cluster = getVdsGroup();
Line 575: if (cluster != null && cluster.supportsGlusterService() &&
!isInternalExecution()) {
Line 576: return
Collections.singletonMap(cluster.getId().toString(),
Line 577:
LockMessagesMatchUtil.makeLockingPair(LockingGroup.GLUSTER,
VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_OPERATION_INPROGRESS));
so you do not need to lock the entire command but only this sequence, and
better move it to gluster utils to handle all that is required at one place...
no?
I can only guess that this is the source of conflict:
if (returnValue && isGlusterSupportEnabled()) {
if (clusterHasServers()) {
upServer = getClusterUtils().getUpServer(getVdsGroupId());
if (upServer == null) {
returnValue =
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NO_GLUSTER_HOST_TO_PEER_PROBE);
}
}
}
Line 578: }
Line 579: return null;
Line 580: }
--
To view, visit http://gerrit.ovirt.org/18350
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6189d7f0046a943a58db9d6734c92fe462c9db52
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sahina Bose <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Kanagaraj M <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Roy Golan <[email protected]>
Gerrit-Reviewer: Sahina Bose <[email protected]>
Gerrit-Reviewer: Shubhendu Tripathi <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
