Oved Ourfali has posted comments on this change. Change subject: core: Add fencing policy as parameter to fenceNode VDSM verb ......................................................................
Patch Set 2: (4 comments) Other than changing the type of the new fencing parameter, all the rest is good. http://gerrit.ovirt.org/#/c/30584/2/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java: Line 119: * @param options Line 120: * Fencing options passed to the agent Line 121: * @return Line 122: */ Line 123: private boolean isAlreadyInRequestedStatus(String options, Map<String, Object> fencingPolicyMap) { Following Barak's comments on the vdsm patch, we need to pass a list of (storage domain id, host id) pairs. These will be checked via the new API to check the connection status of this domain in this host. If the flag is false then we don't need to pass anything, as no logic should be done. Line 124: boolean ret = false; Line 125: FenceActionType action = getParameters().getAction(); Line 126: _result = getBroker().fenceNode(getParameters().getIp(), "", Line 127: getParameters().getType(), getParameters().getUser(), http://gerrit.ovirt.org/#/c/30584/2/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java: Line 93: Line 94: StatusOnlyReturnForXmlRpc setSafeNetworkConfig(); Line 95: Line 96: FenceStatusReturnForXmlRpc fenceNode(String ip, String port, String type, String user, String password, Line 97: String action, String secured, String options, Map<String, Object> fencingPolicy); so this should change as well. Line 98: Line 99: ServerConnectionStatusReturnForXmlRpc connectStorageServer(int serverType, String spUUID, Map<String, String>[] args); Line 100: Line 101: ServerConnectionStatusReturnForXmlRpc disconnectStorageServer(int serverType, String spUUID, http://gerrit.ovirt.org/#/c/30584/2/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java: Line 365: public static final String QOS_PEAK = "peak"; Line 366: public static final String QOS_BURST = "burst"; Line 367: Line 368: // fencing policy Line 369: public static final String SKIP_FENCING_IF_SD_ACTIVE = "skipFencingIfSDActive"; same here. Line 370: Line 371: Line 372: public static String migrationMethodtoString(MigrationMethod method) { Line 373: switch (method) { http://gerrit.ovirt.org/#/c/30584/2/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java: Line 78: public Map<String, Object> fenceNode(String ip, String port, String type, String user, String password, Line 79: String action, String secured, String options); Line 80: Line 81: public Map<String, Object> fenceNode(String ip, String port, String type, String user, String password, Line 82: String action, String secured, String options, Map<String, Object> fencingPolicy); So this should also be a list of pairs. Don't see that we're passing a list here somewhere, so need to make sure we can :-) Line 83: Line 84: public Map<String, Object> connectStorageServer(int serverType, String spUUID, Map<String, String>[] args); Line 85: Line 86: public Map<String, Object> disconnectStorageServer(int serverType, String spUUID, Map<String, String>[] args); -- To view, visit http://gerrit.ovirt.org/30584 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I61ca142f0630ec2d8c1ec16e44c01af989c19079 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> Gerrit-Reviewer: Eli Mesika <[email protected]> Gerrit-Reviewer: Martin Peřina <[email protected]> Gerrit-Reviewer: Oved Ourfali <[email protected]> Gerrit-Reviewer: Piotr Kliczewski <[email protected]> Gerrit-Reviewer: [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
