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

Comment out executor code to make the branch compile. The executors will be removed after the branch has been thoroughly tested and regressions have been resolved, but in the mean time leave the code around so that it can be used to help debug any problems during the testing phase.

This commit is contained in:
Kris McQueen 2010-09-16 19:09:04 -07:00
parent 3f6a438d92
commit 19413d0bec
4 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/async/executor/CancelPrimaryStorageMaintenanceExecutor.java
View File

@ -42,7 +42,7 @@ public class CancelPrimaryStorageMaintenanceExecutor extends BaseAsyncJobExecuto
ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
Long param = gson.fromJson(job.getCmdInfo(), Long.class);
Long userId = job.getUserId();
/*
try {
boolean result = managementServer.cancelPrimaryStorageMaintenance(param.longValue(), userId.longValue());
if(result)
@ -64,6 +64,7 @@ public class CancelPrimaryStorageMaintenanceExecutor extends BaseAsyncJobExecuto
asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR,
e.getMessage());
}
*/
return true;
}
@ -79,7 +80,7 @@ public class CancelPrimaryStorageMaintenanceExecutor extends BaseAsyncJobExecuto
primaryStorageRO.setState(storagePoolVO.getStatus().toString());
primaryStorageRO.setIpAddress(storagePoolVO.getHostAddress());
primaryStorageRO.setZoneId(storagePoolVO.getDataCenterId());
primaryStorageRO.setZoneName(managementServer.getDataCenterBy(storagePoolVO.getDataCenterId()).getName());
// primaryStorageRO.setZoneName(managementServer.getDataCenterBy(storagePoolVO.getDataCenterId()).getName());
if (storagePoolVO.getPodId() != null && managementServer.findHostPodById(storagePoolVO.getPodId()) != null) {
primaryStorageRO.setPodId(storagePoolVO.getPodId());
@ -91,25 +92,25 @@ public class CancelPrimaryStorageMaintenanceExecutor extends BaseAsyncJobExecuto
}
primaryStorageRO.setDiskSizeTotal(storagePoolVO.getCapacityBytes());
StorageStats stats = managementServer.getStoragePoolStatistics(storagePoolVO.getId());
// StorageStats stats = managementServer.getStoragePoolStatistics(storagePoolVO.getId());
long capacity = storagePoolVO.getCapacityBytes();
long available = storagePoolVO.getAvailableBytes() ;
long used = capacity - available;
if (stats != null) {
used = stats.getByteUsed();
available = capacity - used;
}
// if (stats != null) {
// used = stats.getByteUsed();
// available = capacity - used;
// }
primaryStorageRO.setDiskSizeAllocated(used);
if (storagePoolVO.getClusterId() != null)
{
ClusterVO cluster = managementServer.findClusterById(storagePoolVO.getClusterId());
// ClusterVO cluster = managementServer.findClusterById(storagePoolVO.getClusterId());
primaryStorageRO.setClusterId(storagePoolVO.getClusterId());
primaryStorageRO.setClusterName(cluster.getName());
// primaryStorageRO.setClusterName(cluster.getName());
}
primaryStorageRO.setTags(managementServer.getStoragePoolTags(storagePoolVO.getId()));
// primaryStorageRO.setTags(managementServer.getStoragePoolTags(storagePoolVO.getId()));
return primaryStorageRO;
}

6
server/src/com/cloud/async/executor/CreateOrUpdateRuleExecutor.java
View File

@ -43,7 +43,8 @@ public class CreateOrUpdateRuleExecutor extends BaseAsyncJobExecutor {
AsyncJobVO job = getJob();
ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer();
CreateOrUpdateRuleParam param = gson.fromJson(job.getCmdInfo(), CreateOrUpdateRuleParam.class);
/*
try {
if(s_logger.isDebugEnabled())
s_logger.debug("Executing createOrUpdateRule, uid: " + job.getUserId() + ", pfservice id: " + param.getSecurityGroupId()
@ -95,7 +96,8 @@ public class CreateOrUpdateRuleExecutor extends BaseAsyncJobExecutor {
s_logger.warn("Unable to creat or update rule: " + e.getMessage(), e);
asyncMgr.completeAsyncJob(getJob().getId(),
AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage());
}
}
*/
return true;
}

21
server/src/com/cloud/async/executor/CreatePrivateTemplateExecutor.java
View File

@ -52,6 +52,7 @@ public class CreatePrivateTemplateExecutor extends VolumeOperationExecutor {
AsyncJobManager asyncMgr = getAsyncJobMgr();
AsyncJobVO job = getJob();
/*
if(getSyncSource() == null) {
CreatePrivateTemplateParam param = gson.fromJson(job.getCmdInfo(), CreatePrivateTemplateParam.class);
asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
@ -174,6 +175,8 @@ public class CreatePrivateTemplateExecutor extends VolumeOperationExecutor {
asyncMgr.completeAsyncJob(jobId, jobStatus, resultCode, resultObject);
return true;
}
*/
return true;
}
private CreatePrivateTemplateResultObject composeResultObject(VMTemplateVO template, VMTemplateHostVO templateHostRef, Long dataCenterId) {
@ -188,20 +191,20 @@ public class CreatePrivateTemplateExecutor extends VolumeOperationExecutor {
resultObject.setPasswordEnabled(template.getEnablePassword());
resultObject.setCrossZones(template.isCrossZones());
ManagementServer managerServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
GuestOS os = managerServer.findGuestOSById(template.getGuestOSId());
if (os != null) {
resultObject.setOsTypeId(os.getId());
resultObject.setOsTypeName(os.getDisplayName());
} else {
resultObject.setOsTypeId(-1L);
resultObject.setOsTypeName("");
}
// GuestOS os = managerServer.findGuestOSById(template.getGuestOSId());
// if (os != null) {
// resultObject.setOsTypeId(os.getId());
// resultObject.setOsTypeName(os.getDisplayName());
// } else {
// resultObject.setOsTypeId(-1L);
// resultObject.setOsTypeName("");
// }
Account owner = managerServer.findAccountById(template.getAccountId());
if (owner != null) {
resultObject.setAccount(owner.getAccountName());
resultObject.setDomainId(owner.getDomainId());
resultObject.setDomainName(managerServer.findDomainIdById(owner.getDomainId()).getName());
// resultObject.setDomainName(managerServer.findDomainIdById(owner.getDomainId()).getName());
}

11
server/src/com/cloud/async/executor/CreateSnapshotExecutor.java
View File

@ -45,6 +45,7 @@ public class CreateSnapshotExecutor extends BaseAsyncJobExecutor {
AsyncJobVO job = getJob();
Gson gson = GsonHelper.getBuilder().create();
/*
if (getSyncSource() == null) {
SnapshotOperationParam param = gson.fromJson(job.getCmdInfo(), SnapshotOperationParam.class);
asyncMgr.syncAsyncJobExecution(job.getId(), "Volume", param.getVolumeId());
@ -95,12 +96,14 @@ public class CreateSnapshotExecutor extends BaseAsyncJobExecutor {
snapshotManager.postCreateSnapshot(userId, volumeId, snapshotId, policyIds, backedUp);
return true;
}
*/
return true;
}
private CreateSnapshotResultObject composeResultObject(Snapshot snapshot) {
CreateSnapshotResultObject resultObject = new CreateSnapshotResultObject();
ManagementServer managementServer = getAsyncJobMgr().getExecutorContext().getManagementServer();
VolumeVO volume = managementServer.findVolumeById(snapshot.getVolumeId());
// VolumeVO volume = managementServer.findVolumeById(snapshot.getVolumeId());
resultObject.setId(snapshot.getId());
long domainId = -1;
@ -113,15 +116,15 @@ public class CreateSnapshotExecutor extends BaseAsyncJobExecutor {
if(domainId != -1)
{
resultObject.setDomainId(domainId);
resultObject.setDomainName(getAsyncJobMgr().getExecutorContext().getManagementServer().findDomainIdById(domainId).getName());
// resultObject.setDomainName(getAsyncJobMgr().getExecutorContext().getManagementServer().findDomainIdById(domainId).getName());
}
}
String snapshotTypeStr = SnapshotType.values()[snapshot.getSnapshotType()].name();
resultObject.setSnapshotType(snapshotTypeStr);
resultObject.setVolumeId(snapshot.getVolumeId());
resultObject.setVolumeName(volume.getName());
resultObject.setVolumeType(volume.getVolumeType());
// resultObject.setVolumeName(volume.getName());
// resultObject.setVolumeType(volume.getVolumeType());
resultObject.setCreated(snapshot.getCreated());
resultObject.setName(snapshot.getName());
return resultObject;