apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in

Browse Source 
listXXX api and incorrect async job status in other async api.

Conflicts:
	server/src/com/cloud/api/query/vo/AccountJoinVO.java
This commit is contained in:
Min Chen 2013-04-25 17:40:18 -07:00
parent 64635abba5
commit efb4471dc9
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

@ -203,8 +203,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

@ -158,8 +158,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

@ -183,8 +183,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

@ -103,8 +103,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

@ -83,8 +83,10 @@ public class UserAccountJoinDaoImpl extends GenericDaoBase<UserAccountJoinVO, Lo
userResponse.setIsDefault(usr.isDefault());
// 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

@ -134,8 +134,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

@ -197,8 +197,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

@ -177,7 +177,7 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
private Long secondaryStorageTotal;
@Column(name="job_id")
private long jobId;
private Long jobId;
@Column(name="job_uuid")
private String jobUuid;
@ -645,12 +645,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

@ -210,7 +210,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;
@ -781,14 +781,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

@ -168,7 +168,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;
@ -427,11 +427,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

@ -121,7 +121,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;
@ -342,11 +342,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;
@ -324,11 +324,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

@ -332,7 +332,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;
@ -1608,14 +1608,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

@ -206,7 +206,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;
@ -817,13 +817,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;
}