Alissa Bonas has uploaded a new change for review.
Change subject: core: rename fence methods to start with lowercase.
......................................................................
core: rename fence methods to start with lowercase.
Cleans some findbugs warnings.
Change-Id: I0efff7949a568367a5c40507d19fd26b2e233c21
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
5 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/20738/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
index b7b746d..ebd14e5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
@@ -145,11 +145,11 @@
proxy, origin, command, _vds.getName());
}
- public VDSReturnValue Fence() {
- return Fence(FenceAgentOrder.Primary);
+ public VDSReturnValue fence() {
+ return fence(FenceAgentOrder.Primary);
}
- public VDSReturnValue Fence(FenceAgentOrder order) {
+ public VDSReturnValue fence(FenceAgentOrder order) {
VDSReturnValue retValue = null;
try {
// skip following code in case of testing a new host status
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
index 64ee181..c2ca611 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
@@ -182,7 +182,7 @@
private void handleSingleAgent(VDSStatus lastStatus, VDSReturnValue
vdsReturnValue) {
executor = new FenceExecutor(getVds(), getParameters().getAction());
if (executor.findProxyHost()) {
- vdsReturnValue = executor.Fence();
+ vdsReturnValue = executor.fence();
setFenceSucceeded(vdsReturnValue.getSucceeded());
if (getFenceSucceeded()) {
executor = new FenceExecutor(getVds(), FenceActionType.Status);
@@ -209,7 +209,7 @@
private void handleMultipleSequentialAgents(VDSStatus lastStatus,
VDSReturnValue vdsReturnValue) {
executor = new FenceExecutor(getVds(), getParameters().getAction());
if (executor.findProxyHost()) {
- vdsReturnValue = executor.Fence(FenceAgentOrder.Primary);
+ vdsReturnValue = executor.fence(FenceAgentOrder.Primary);
setFenceSucceeded(vdsReturnValue.getSucceeded());
if (getFenceSucceeded()) {
executor = new FenceExecutor(getVds(), FenceActionType.Status);
@@ -235,7 +235,7 @@
* @param lastStatus
*/
private void tryOtherSequentialAgent(VDSStatus lastStatus) {
- VDSReturnValue vdsReturnValue =
executor.Fence(FenceAgentOrder.Secondary);
+ VDSReturnValue vdsReturnValue =
executor.fence(FenceAgentOrder.Secondary);
setFenceSucceeded(vdsReturnValue.getSucceeded());
if (getFenceSucceeded()) {
executor = new FenceExecutor(getVds(), FenceActionType.Status);
@@ -361,7 +361,7 @@
private FenceInvocationResult run(FenceExecutor fenceExecutor,
FenceAgentOrder order) {
FenceInvocationResult fenceInvocationResult = new
FenceInvocationResult();
fenceInvocationResult.setOrder(order);
- fenceInvocationResult.setValue(fenceExecutor.Fence(order));
+ fenceInvocationResult.setValue(fenceExecutor.fence(order));
if (fenceInvocationResult.getValue().getSucceeded()) {
this.executor = new FenceExecutor(getVds(),
FenceActionType.Status);
fenceInvocationResult.setSucceeded(waitForStatus(getVds().getName(),
getParameters().getAction(), order));
@@ -376,7 +376,7 @@
// before giving up
if (getParameters().getAction() == FenceActionType.Start) {
executor = new FenceExecutor(getVds(), FenceActionType.Start);
- vdsReturnValue = executor.Fence(order);
+ vdsReturnValue = executor.fence(order);
setFenceSucceeded(vdsReturnValue.getSucceeded());
if (getFenceSucceeded()) {
executor = new FenceExecutor(getVds(), FenceActionType.Status);
@@ -509,7 +509,7 @@
while (!statusReached && i <= getRerties()) {
log.infoFormat("Attempt {0} to get vds {1} status", i, vdsName);
if (executor.findProxyHost()) {
- VDSReturnValue returnValue = executor.Fence(order);
+ VDSReturnValue returnValue = executor.fence(order);
if (returnValue != null && returnValue.getReturnValue() !=
null) {
FenceStatusReturnValue value = (FenceStatusReturnValue)
returnValue.getReturnValue();
if (value.getStatus().equalsIgnoreCase("unknown")) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
index 937d72f..a1a038d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
@@ -40,7 +40,7 @@
VDS vds = tempVar;
FenceExecutor executor = new FenceExecutor(vds,
FenceActionType.Status);
if (executor.findProxyHost()) {
- VDSReturnValue returnValue =
executor.Fence(getParameters().getOrder());
+ VDSReturnValue returnValue =
executor.fence(getParameters().getOrder());
if (returnValue.getReturnValue() != null) {
getQueryReturnValue().setReturnValue(returnValue.getReturnValue());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
index 3557d72..50f9999 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
@@ -26,13 +26,13 @@
FenceExecutor executor = new FenceExecutor(vds,
FenceActionType.Status);
VDSReturnValue returnValue = null;
if (executor.findProxyHost()) {
- returnValue = executor.Fence(FenceAgentOrder.Primary);
+ returnValue = executor.fence(FenceAgentOrder.Primary);
if (returnValue.getReturnValue() != null) {
if (returnValue.getSucceeded()) {
boolean succeeded = true;
// check if we have secondary agent settings
if (vds.getPmSecondaryIp() != null &&
!vds.getPmSecondaryIp().isEmpty()) {
- returnValue =
executor.Fence(FenceAgentOrder.Secondary);
+ returnValue =
executor.fence(FenceAgentOrder.Secondary);
succeeded = returnValue.getSucceeded();
}
if (succeeded) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
index ee5f483..947f4a9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
@@ -144,7 +144,7 @@
// check first if we have any VDS to act as the proxy for fence
// actions.
if (getVds().getpm_enabled() && executor.findProxyHost()) {
- VDSReturnValue returnValue = executor.Fence();
+ VDSReturnValue returnValue = executor.fence();
fenceSucceeded = returnValue.getSucceeded();
fenceStatusReturnValue = (FenceStatusReturnValue)
returnValue.getReturnValue();
vdsProxyFound = true;
--
To view, visit http://gerrit.ovirt.org/20738
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0efff7949a568367a5c40507d19fd26b2e233c21
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
