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

CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in listXXX api and incorrect async job status in other async api.

This commit is contained in:
Min Chen 2013-04-25 16:16:13 -07:00 committed by Chip Childers
parent 3eeaff03ec
commit 6dbf3e7b35
17 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/cloud/async/AsyncJobVO.java
View File

@ -133,6 +133,7 @@ public class AsyncJobVO implements AsyncJob {
this.callbackType = CALLBACK_POLLING;
this.uuid = UUID.randomUUID().toString();
this.instanceId = instanceId;
this.instanceType = instanceType;
}
public AsyncJobVO(long userId, long accountId, String cmd, String cmdInfo,

6
server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
View File

@ -167,8 +167,10 @@ public class AccountJoinDaoImpl extends GenericDaoBase<AccountJoinVO, Long> impl
accountResponse.setObjectName("account");
// set async job
accountResponse.setJobId(account.getJobUuid());
accountResponse.setJobStatus(account.getJobStatus());
if (account.getJobId() != null) {
accountResponse.setJobId(account.getJobUuid());
accountResponse.setJobStatus(account.getJobStatus());
}
return accountResponse;
}

6
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
View File

@ -157,8 +157,10 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
routerResponse.setVpcId(router.getVpcUuid());
// set async job
routerResponse.setJobId(router.getJobUuid());
routerResponse.setJobStatus(router.getJobStatus());
if (router.getJobId() != null) {
routerResponse.setJobId(router.getJobUuid());
routerResponse.setJobStatus(router.getJobStatus());
}
routerResponse.setObjectName("router");

6
server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
View File

@ -181,8 +181,10 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
hostResponse.setResourceState(host.getResourceState().toString());
// set async job
hostResponse.setJobId(host.getJobUuid());
hostResponse.setJobStatus(host.getJobStatus());
if (host.getJobId() != null) {
hostResponse.setJobId(host.getJobUuid());
hostResponse.setJobStatus(host.getJobStatus());
}
hostResponse.setObjectName("host");

6
server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java
View File

@ -117,8 +117,10 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase<SecurityGroupJoinVO
}
// set async job
sgResponse.setJobId(vsg.getJobUuid());
sgResponse.setJobStatus(vsg.getJobStatus());
if (vsg.getJobId() != null) {
sgResponse.setJobId(vsg.getJobUuid());
sgResponse.setJobStatus(vsg.getJobStatus());
}
sgResponse.setObjectName("securitygroup");

6
server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
View File

@ -100,8 +100,10 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
poolResponse.setTags(pool.getTag());
// set async job
poolResponse.setJobId(pool.getJobUuid());
poolResponse.setJobStatus(pool.getJobStatus());
if (pool.getJobId() != null) {
poolResponse.setJobId(pool.getJobUuid());
poolResponse.setJobStatus(pool.getJobStatus());
}
poolResponse.setObjectName("storagepool");
return poolResponse;

6
server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java
View File

@ -82,8 +82,10 @@ public class UserAccountJoinDaoImpl extends GenericDaoBase<UserAccountJoinVO, Lo
userResponse.setSecretKey(usr.getSecretKey());
// set async job
userResponse.setJobId(usr.getJobUuid());
userResponse.setJobStatus(usr.getJobStatus());
if (usr.getJobId() != null) {
userResponse.setJobId(usr.getJobUuid());
userResponse.setJobStatus(usr.getJobStatus());
}
userResponse.setObjectName("user");

6
server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
View File

@ -132,8 +132,10 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
}
}
userVmResponse.setPassword(userVm.getPassword());
userVmResponse.setJobId(userVm.getJobUuid());
userVmResponse.setJobStatus(userVm.getJobStatus());
if (userVm.getJobId() != null) {
userVmResponse.setJobId(userVm.getJobUuid());
userVmResponse.setJobStatus(userVm.getJobStatus());
}
//userVmResponse.setForVirtualNetwork(userVm.getForVirtualNetwork());
userVmResponse.setPublicIpId(userVm.getPublicIpUuid());

6
server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
View File

@ -196,8 +196,10 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
volResponse.setExtractable(isExtractable);
// set async job
volResponse.setJobId(volume.getJobUuid());
volResponse.setJobStatus(volume.getJobStatus());
if (volume.getJobId() != null) {
volResponse.setJobId(volume.getJobUuid());
volResponse.setJobStatus(volume.getJobStatus());
}
volResponse.setObjectName("volume");
return volResponse;

6
server/src/com/cloud/api/query/vo/AccountJoinVO.java
View File

@ -149,7 +149,7 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
private Long vpcTotal;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -536,12 +536,12 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
View File

@ -207,7 +207,7 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
private String projectName;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -769,14 +769,14 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/HostJoinVO.java
View File

@ -165,7 +165,7 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
private long cpuReservedCapacity;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -416,11 +416,11 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
this.osCategoryName = osCategoryName;
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java
View File

@ -77,7 +77,7 @@ public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
private String projectName;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -269,11 +269,11 @@ public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
this.projectName = projectName;
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
View File

@ -117,7 +117,7 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -312,11 +312,11 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I
this.reservedCapacity = reservedCapacity;
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/UserAccountJoinVO.java
View File

@ -109,7 +109,7 @@ public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, I
private String domainPath = null;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -321,11 +321,11 @@ public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, I
this.loginAttempts = loginAttempts;
}
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
View File

@ -329,7 +329,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String keypairName;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -1583,14 +1583,14 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}

6
server/src/com/cloud/api/query/vo/VolumeJoinVO.java
View File

@ -203,7 +203,7 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity {
private Storage.TemplateType templateType;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -814,13 +814,13 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity {
public long getJobId() {
public Long getJobId() {
return jobId;
}
public void setJobId(long jobId) {
public void setJobId(Long jobId) {
this.jobId = jobId;
}