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

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
nit 2010-11-24 18:38:23 +05:30
parent 8ea124ae79 f70071dc98
commit 841044e360
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/event/EventTypes.java
View File

@ -25,8 +25,7 @@ public class EventTypes {
public static final String EVENT_VM_START = "VM.START";
public static final String EVENT_VM_STOP = "VM.STOP";
public static final String EVENT_VM_REBOOT = "VM.REBOOT";
public static final String EVENT_VM_DISABLE_HA = "VM.DISABLEHA";
public static final String EVENT_VM_ENABLE_HA = "VM.ENABLEHA";
public static final String EVENT_VM_UPDATE = "VM.UPDATE";
public static final String EVENT_VM_UPGRADE = "VM.UPGRADE";
public static final String EVENT_VM_RESETPASSWORD = "VM.RESETPASSWORD";
@ -84,7 +83,8 @@ public class EventTypes {
public static final String EVENT_TEMPLATE_DOWNLOAD_FAILED = "TEMPLATE.DOWNLOAD.FAILED";
public static final String EVENT_TEMPLATE_COPY = "TEMPLATE.COPY";
public static final String EVENT_TEMPLATE_EXTRACT = "TEMPLATE.EXTRACT";
public static final String EVENT_TEMPLATE_UPLOAD = "TEMPLATE.UPLOAD";
public static final String EVENT_TEMPLATE_UPLOAD = "TEMPLATE.UPLOAD";
public static final String EVENT_TEMPLATE_CLEANUP = "TEMPLATE.CLEANUP";
// Volume Events
public static final String EVENT_VOLUME_CREATE = "VOLUME.CREATE";

4
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
View File

@ -513,12 +513,12 @@ public class DownloadMonitorImpl implements DownloadMonitor {
long result = send(sserverId, dtCommand, null);
if (result == -1 ){
String description = "Failed to delete " + tInfo.getTemplateName() + " on secondary storage " + sserverId + " which isn't in the database";
logEvent(1L, EventTypes.EVENT_TEMPLATE_DELETE, description , EventVO.LEVEL_ERROR);
logEvent(1L, EventTypes.EVENT_TEMPLATE_CLEANUP, description , EventVO.LEVEL_ERROR);
s_logger.error(description);
return;
}
String description = "Deleted template " + tInfo.getTemplateName() + " on secondary storage " + sserverId + " since it isn't in the database, result=" + result;
logEvent(1L, EventTypes.EVENT_TEMPLATE_DELETE, description, EventVO.LEVEL_INFO);
logEvent(1L, EventTypes.EVENT_TEMPLATE_CLEANUP, description, EventVO.LEVEL_INFO);
s_logger.info(description);
}

38
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -3129,7 +3129,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
}
userId = accountAndUserValidation(id, account, userId,vmInstance);
if (displayName == null) {
displayName = vmInstance.getDisplayName();
}
@ -3144,25 +3144,31 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
throw new CloudRuntimeException("Unable to find virual machine with id " + id);
}
if (group != null) {
addInstanceToGroup(id, group);
String description = "";
if(displayName != vmInstance.getDisplayName()){
description += "New display name: "+displayName+". ";
}
if(ha != vmInstance.isHaEnabled()){
if(ha){
description += "Enabled HA. ";
} else {
description += "Disabled HA. ";
}
}
boolean haEnabled = vm.isHaEnabled();
_vmDao.updateVM(id, displayName, ha);
if (haEnabled != ha) {
String description = null;
String type = null;
if (ha) {
description = "Successfully enabled HA for virtual machine " + vm.getHostName();
type = EventTypes.EVENT_VM_ENABLE_HA;
} else {
description = "Successfully disabled HA for virtual machine " + vm.getHostName();
type = EventTypes.EVENT_VM_DISABLE_HA;
if (group != null) {
if(addInstanceToGroup(id, group)){
description += "Added to group: "+group+".";
}
// create a event for the change in HA Enabled flag
EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, type, description, null);
}
_vmDao.updateVM(id, displayName, ha);
// create a event for the change in HA Enabled flag
EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, EventTypes.EVENT_VM_UPDATE, "Successfully updated virtual machine: "+vm.getHostName()+". "+description, null);
return _vmDao.findById(id);
}