Shireesh Anjal has uploaded a new change for review.
Change subject: engine: fix in GlusterManager
......................................................................
engine: fix in GlusterManager
A parallel change in the GlusterServersListVDSCommand had changed the
return type from Set to List. Changing GlusterManager accordingly.
Change-Id: Iefd20756dee267592dfb70754d14f60938973fe6
Signed-off-by: Shireesh Anjal <san...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
2 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/9135/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
index f346851..e425a40 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
@@ -174,13 +174,13 @@
return;
}
- Set<GlusterServerInfo> fetchedServers = fetchServers(cluster,
upServer, existingServers);
+ List<GlusterServerInfo> fetchedServers = fetchServers(cluster,
upServer, existingServers);
if (fetchedServers != null) {
removeDetachedServers(existingServers, fetchedServers);
}
}
- private void removeDetachedServers(List<VDS> existingServers,
Set<GlusterServerInfo> fetchedServers) {
+ private void removeDetachedServers(List<VDS> existingServers,
List<GlusterServerInfo> fetchedServers) {
for (VDS server : existingServers) {
if (isRemovableStatus(server.getstatus()) &&
serverDetached(server, fetchedServers)) {
log.debugFormat("Server {0} has been removed directly using
the gluster CLI. Removing it from engine as well.",
@@ -242,7 +242,7 @@
* @param fetchedServers
* @return
*/
- private boolean serverDetached(VDS server, Set<GlusterServerInfo>
fetchedServers) {
+ private boolean serverDetached(VDS server, List<GlusterServerInfo>
fetchedServers) {
List<String> vdsIps = getVdsIps(server);
for (GlusterServerInfo fetchedServer : fetchedServers) {
if (fetchedServer.getHostnameOrIp().equals(server.gethost_name())
@@ -263,10 +263,10 @@
return vdsIps;
}
- private Set<GlusterServerInfo> fetchServers(VDSGroup cluster, VDS
upServer, List<VDS> existingServers) {
+ private List<GlusterServerInfo> fetchServers(VDSGroup cluster, VDS
upServer, List<VDS> existingServers) {
// Create a copy of the existing servers as the fetchServer method can
potentially remove elements from it
List<VDS> tempServers = new ArrayList<VDS>(existingServers);
- Set<GlusterServerInfo> fetchedServers = fetchServers(upServer,
tempServers);
+ List<GlusterServerInfo> fetchedServers = fetchServers(upServer,
tempServers);
if (fetchedServers == null) {
log.errorFormat("gluster peer status command failed on all servers
of the cluster {0}."
@@ -311,8 +311,8 @@
* @param existingServers
* @return
*/
- private Set<GlusterServerInfo> fetchServers(VDS upServer, List<VDS>
existingServers) {
- Set<GlusterServerInfo> fetchedServers = null;
+ private List<GlusterServerInfo> fetchServers(VDS upServer, List<VDS>
existingServers) {
+ List<GlusterServerInfo> fetchedServers = null;
while (fetchedServers == null && !existingServers.isEmpty()) {
fetchedServers = fetchServers(upServer);
if (fetchedServers == null) {
@@ -336,14 +336,14 @@
}
@SuppressWarnings("unchecked")
- protected Set<GlusterServerInfo> fetchServers(VDS upServer) {
+ protected List<GlusterServerInfo> fetchServers(VDS upServer) {
VDSReturnValue result =
Backend.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.GlusterServersList,
new
VdsIdVDSCommandParametersBase(upServer.getId()));
- return result.getSucceeded() ? (Set<GlusterServerInfo>)
result.getReturnValue() : null;
+ return result.getSucceeded() ? (List<GlusterServerInfo>)
result.getReturnValue() : null;
}
/**
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
index 691bc89..8ba92dd 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
@@ -13,10 +13,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.transaction.Status;
import javax.transaction.Transaction;
@@ -509,8 +507,8 @@
addedBrickIds.add(brick.getId());
}
- private Set<GlusterServerInfo> getFetchedServersList() {
- Set<GlusterServerInfo> servers = new HashSet<GlusterServerInfo>();
+ private List<GlusterServerInfo> getFetchedServersList() {
+ List<GlusterServerInfo> servers = new ArrayList<GlusterServerInfo>();
servers.add(new GlusterServerInfo(SERVER_ID_1, SERVER_NAME_1,
PeerStatus.CONNECTED));
servers.add(new GlusterServerInfo(SERVER_ID_2, SERVER_NAME_2,
PeerStatus.CONNECTED));
return servers;
--
To view, visit http://gerrit.ovirt.org/9135
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefd20756dee267592dfb70754d14f60938973fe6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <san...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
