etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12348: putting a better check on stopped states

This commit is contained in:
Abhinandan Prateek 2011-12-06 09:13:20 +05:30
parent 8086e9abc7
commit 90a6bab334
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/agent/api/ClusterSyncAnswer.java
View File

@ -42,6 +42,7 @@ public class ClusterSyncAnswer extends Answer {
public ClusterSyncAnswer(long clusterId, HashMap<String, Pair<String, State>> newStates){
_clusterId = clusterId;
_newStates = newStates;
_allStates = null;
_type = DELTA_SYNC;
result = true;
}

6
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -6626,7 +6626,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
//check if host is changed
if (host_uuid != null && oldState != null){
if (!host_uuid.equals(oldState.first())){
if (!host_uuid.equals(oldState.first()) && newState != State.Stopped && newState != State.Stopping){
changes.put(vm, new Pair<String, State>(host_uuid, newState));
s_vms.put(_cluster, host_uuid, vm, newState);
continue;
@ -6697,8 +6697,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
} else if (oldState == State.Migrating) {
s_logger.warn("Ignoring VM " + vm + " in migrating state.");
} else {
State newState = State.Stopped;
changes.put(vm, new Pair<String, State>(host_uuid, newState));
//State newState = State.Stopped;
//changes.put(vm, new Pair<String, State>(host_uuid, newState));
}
}
}

2
server/src/com/cloud/server/auth/LDAPUserAuthenticator.java
View File

@ -89,7 +89,7 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
// substitute the queryFilter with this user info
queryFilter = queryFilter.replaceAll("\\%u", username);
queryFilter = queryFilter.replaceAll("\\%n", user.getFirstname() + " " + user.getLastname());
queryFilter = queryFilter.replaceAll("%e", user.getEmail());
queryFilter = queryFilter.replaceAll("\\%e", user.getEmail());
SearchControls sc = new SearchControls();