You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/01/15 03:04:54 UTC
[15/44] Revert "Merge remote-tracking branch 'origin/javelin' into
javelin"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
index 2d86ca0..7631657 100644
--- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
@@ -20,18 +20,16 @@ import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
+import org.apache.cloudstack.api.response.ResourceTagResponse;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.ApiResponseHelper;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.configuration.dao.ConfigurationDao;
-
-import org.apache.cloudstack.api.response.ResourceTagResponse;
-import org.springframework.stereotype.Component;
-
import com.cloud.server.ResourceTag;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -44,9 +42,9 @@ public class ResourceTagJoinDaoImpl extends GenericDaoBase<ResourceTagJoinVO, Lo
@Inject
private ConfigurationDao _configDao;
- private SearchBuilder<ResourceTagJoinVO> tagSearch;
+ private final SearchBuilder<ResourceTagJoinVO> tagSearch;
- private SearchBuilder<ResourceTagJoinVO> tagIdSearch;
+ private final SearchBuilder<ResourceTagJoinVO> tagIdSearch;
protected ResourceTagJoinDaoImpl() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java
index f6847aa..3e579c1 100644
--- a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java
@@ -20,23 +20,21 @@ import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
+import org.apache.cloudstack.api.response.SecurityGroupResponse;
+import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.ApiResponseHelper;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.SecurityGroupJoinVO;
import com.cloud.configuration.dao.ConfigurationDao;
-
-import org.apache.cloudstack.api.response.SecurityGroupResponse;
-import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
-import org.springframework.stereotype.Component;
-
import com.cloud.network.security.SecurityGroup;
import com.cloud.network.security.SecurityRule.SecurityRuleType;
import com.cloud.user.Account;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -49,9 +47,9 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase<SecurityGroupJoinVO
@Inject
private ConfigurationDao _configDao;
- private SearchBuilder<SecurityGroupJoinVO> sgSearch;
+ private final SearchBuilder<SecurityGroupJoinVO> sgSearch;
- private SearchBuilder<SecurityGroupJoinVO> sgIdSearch;
+ private final SearchBuilder<SecurityGroupJoinVO> sgIdSearch;
protected SecurityGroupJoinDaoImpl() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index 53a0ffe..66aecc2 100644
--- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -18,19 +18,19 @@ package com.cloud.api.query.dao;
import java.util.ArrayList;
import java.util.List;
+
import javax.ejb.Local;
+import javax.inject.Inject;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.StoragePoolJoinVO;
import com.cloud.configuration.dao.ConfigurationDao;
-import org.apache.cloudstack.api.response.StoragePoolResponse;
-import org.springframework.stereotype.Component;
-
import com.cloud.storage.StoragePool;
import com.cloud.storage.StorageStats;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -44,9 +44,9 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
@Inject
private ConfigurationDao _configDao;
- private SearchBuilder<StoragePoolJoinVO> spSearch;
+ private final SearchBuilder<StoragePoolJoinVO> spSearch;
- private SearchBuilder<StoragePoolJoinVO> spIdSearch;
+ private final SearchBuilder<StoragePoolJoinVO> spIdSearch;
protected StoragePoolJoinDaoImpl() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index ce3d808..6f5587f 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -24,23 +24,21 @@ import java.util.List;
import java.util.Set;
import javax.ejb.Local;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.api.ApiDBUtils;
-import com.cloud.api.query.vo.ResourceTagJoinVO;
-import com.cloud.api.query.vo.UserVmJoinVO;
-import com.cloud.configuration.dao.ConfigurationDao;
+import javax.inject.Inject;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.NicResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
+import com.cloud.api.ApiDBUtils;
+import com.cloud.api.query.vo.ResourceTagJoinVO;
+import com.cloud.api.query.vo.UserVmJoinVO;
+import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -55,7 +53,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
@Inject
private ConfigurationDao _configDao;
- private SearchBuilder<UserVmJoinVO> VmDetailSearch;
+ private final SearchBuilder<UserVmJoinVO> VmDetailSearch;
protected UserVmJoinDaoImpl() {
@@ -68,6 +66,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
}
+ @Override
public UserVmResponse newUserVmResponse(String objectName, UserVmJoinVO userVm, EnumSet<VMDetails> details, Account caller) {
UserVmResponse userVmResponse = new UserVmResponse();
@@ -216,8 +215,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
userVmResponse.setObjectName(objectName);
return userVmResponse;
- }
+ }
+ @Override
public UserVmResponse setUserVmResponse(UserVmResponse userVmData, UserVmJoinVO uvo) {
Long securityGroupId = uvo.getSecurityGroupId();
if (securityGroupId != null && securityGroupId.longValue() != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 65ecd1b..495c0eb 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -20,26 +20,24 @@ import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
+import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.ApiResponseHelper;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.VolumeJoinVO;
import com.cloud.configuration.dao.ConfigurationDao;
-
-import org.apache.cloudstack.api.response.VolumeResponse;
-import org.springframework.stereotype.Component;
-
import com.cloud.offering.ServiceOffering;
import com.cloud.storage.Storage;
import com.cloud.storage.VMTemplateHostVO;
-import com.cloud.storage.Volume;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
+import com.cloud.storage.Volume;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -53,9 +51,9 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
@Inject
private ConfigurationDao _configDao;
- private SearchBuilder<VolumeJoinVO> volSearch;
+ private final SearchBuilder<VolumeJoinVO> volSearch;
- private SearchBuilder<VolumeJoinVO> volIdSearch;
+ private final SearchBuilder<VolumeJoinVO> volIdSearch;
protected VolumeJoinDaoImpl() {
@@ -176,12 +174,12 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
boolean isExtractable = true;
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont
- // have any
- // template
- // dependence.
+ // have any
+ // template
+ // dependence.
if (volume.getTemplateId() > 0) { // For ISO based volumes template
- // = null and we allow extraction
- // of all ISO based volumes
+ // = null and we allow extraction
+ // of all ISO based volumes
isExtractable = volume.isExtractable() && volume.getTemplateType() != Storage.TemplateType.SYSTEM;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/api/response/ApiResponseSerializer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index 470cc5f..11aee3d 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -37,7 +37,6 @@ import com.cloud.api.ApiResponseGsonHelper;
import com.cloud.api.ApiServer;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.ResponseObject;
-import com.cloud.utils.IdentityProxy;
import com.cloud.utils.encoding.URLEncoder;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.uuididentity.dao.IdentityDao;
@@ -226,27 +225,17 @@ public class ApiResponseSerializer {
subObj.setObjectName(serializedName.value());
}
serializeResponseObjXML(sb, subObj);
- } else if (value instanceof IdentityProxy) {
- // Only exception reponses carry a list of IdentityProxy objects.
- IdentityProxy idProxy = (IdentityProxy)value;
- String id = (idProxy.getValue() != null ? String.valueOf(idProxy.getValue()) : "");
- if(!id.isEmpty()) {
- IdentityDao identityDao = new IdentityDaoImpl();
- id = identityDao.getIdentityUuid(idProxy.getTableName(), id);
- }
- if(id != null && !id.isEmpty()) {
- // If this is the first IdentityProxy field encountered, put in a uuidList tag.
- if (!usedUuidList) {
- sb.append("<").append(serializedName.value()).append(">");
- usedUuidList = true;
- }
- sb.append("<uuid>").append(id).append("</uuid>");
- }
- // Append the new idFieldName property also.
- String idFieldName = idProxy.getidFieldName();
- if (idFieldName != null) {
- sb.append("<uuidProperty>").append(idFieldName).append("</uuidProperty>");
- }
+ } else {
+ // Only exception reponses carry a list of uuid
+ // strings.
+ // If this is the first IdentityProxy field
+ // encountered, put in a uuidList tag.
+ if (!usedUuidList) {
+ sb.append("<").append(serializedName.value()).append(">");
+ usedUuidList = true;
+ }
+ sb.append("<uuid>").append(value).append("</uuid>");
+ // We have removed uuid property field due to removal of IdentityProxy class.
}
}
if (usedUuidList) {
@@ -256,19 +245,6 @@ public class ApiResponseSerializer {
} else if (fieldValue instanceof Date) {
sb.append("<").append(serializedName.value()).append(">").append(BaseCmd.getDateString((Date) fieldValue)).
append("</").append(serializedName.value()).append(">");
- } else if (fieldValue instanceof IdentityProxy) {
- IdentityProxy idProxy = (IdentityProxy)fieldValue;
- String id = (idProxy.getValue() != null ? String.valueOf(idProxy.getValue()) : "");
- if(!id.isEmpty()) {
- IdentityDao identityDao = new IdentityDaoImpl();
- if(idProxy.getTableName() != null) {
- id = identityDao.getIdentityUuid(idProxy.getTableName(), id);
- } else {
- s_logger.warn("IdentityProxy sanity check issue, invalid IdentityProxy table name found in class: " + obj.getClass().getName());
- }
- }
- if(id != null && !id.isEmpty())
- sb.append("<").append(serializedName.value()).append(">").append(id).append("</").append(serializedName.value()).append(">");
} else {
String resultString = escapeSpecialXmlChars(fieldValue.toString());
if (!(obj instanceof ExceptionResponse)) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java b/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java
index ed64419..4181448 100644
--- a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java
+++ b/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java
@@ -36,7 +36,6 @@ import com.cloud.storage.snapshot.SnapshotManager;
import com.cloud.user.AccountManager;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.DomainRouterDao;
@@ -45,8 +44,8 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value={AsyncJobExecutorContext.class})
public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext {
- private String _name;
-
+ private String _name;
+
@Inject private AgentManager _agentMgr;
@Inject private NetworkManager _networkMgr;
@Inject private UserVmManager _vmMgr;
@@ -62,98 +61,98 @@ public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext {
@Inject private AsyncJobDao _jobDao;
@Inject private UserDao _userDao;
@Inject private VirtualMachineManager _itMgr;
-
+
@Inject private ManagementServer _managementServer;
-
- @Override
- public ManagementServer getManagementServer() {
- return _managementServer;
- }
-
- @Override
- public AgentManager getAgentMgr() {
- return _agentMgr;
- }
-
- @Override
- public NetworkManager getNetworkMgr() {
- return _networkMgr;
- }
-
- @Override
- public UserVmManager getVmMgr() {
- return _vmMgr;
- }
-
- @Override
- public StorageManager getStorageMgr() {
- return _storageMgr;
- }
-
- /**server/src/com/cloud/async/AsyncJobExecutorContext.java
+
+ @Override
+ public ManagementServer getManagementServer() {
+ return _managementServer;
+ }
+
+ @Override
+ public AgentManager getAgentMgr() {
+ return _agentMgr;
+ }
+
+ @Override
+ public NetworkManager getNetworkMgr() {
+ return _networkMgr;
+ }
+
+ @Override
+ public UserVmManager getVmMgr() {
+ return _vmMgr;
+ }
+
+ @Override
+ public StorageManager getStorageMgr() {
+ return _storageMgr;
+ }
+
+ /**server/src/com/cloud/async/AsyncJobExecutorContext.java
* @return the _snapMgr
*/
- @Override
+ @Override
public SnapshotManager getSnapshotMgr() {
return _snapMgr;
}
@Override
- public AccountManager getAccountMgr() {
- return _accountMgr;
- }
-
- @Override
- public EventDao getEventDao() {
- return _eventDao;
- }
-
- @Override
- public UserVmDao getVmDao() {
- return _vmDao;
- }
-
- @Override
- public AccountDao getAccountDao() {
- return _accountDao;
- }
-
- @Override
- public VolumeDao getVolumeDao() {
- return _volumeDao;
- }
-
- @Override
+ public AccountManager getAccountMgr() {
+ return _accountMgr;
+ }
+
+ @Override
+ public EventDao getEventDao() {
+ return _eventDao;
+ }
+
+ @Override
+ public UserVmDao getVmDao() {
+ return _vmDao;
+ }
+
+ @Override
+ public AccountDao getAccountDao() {
+ return _accountDao;
+ }
+
+ @Override
+ public VolumeDao getVolumeDao() {
+ return _volumeDao;
+ }
+
+ @Override
public DomainRouterDao getRouterDao() {
- return _routerDao;
- }
-
- @Override
+ return _routerDao;
+ }
+
+ @Override
public IPAddressDao getIpAddressDao() {
- return _ipAddressDao;
+ return _ipAddressDao;
}
-
- @Override
+
+ @Override
public AsyncJobDao getJobDao() {
- return _jobDao;
+ return _jobDao;
}
-
- @Override
+
+ @Override
public UserDao getUserDao() {
- return _userDao;
+ return _userDao;
+ }
+
+ @Override
+ public VirtualMachineManager getItMgr() {
+ return _itMgr;
}
-
- @Override
- public VirtualMachineManager getItMgr() {
- return _itMgr;
- }
-
+
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
- return true;
+ _name = name;
+ return true;
}
-
+
@Override
public boolean start() {
return true;
@@ -163,9 +162,9 @@ public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext {
public boolean stop() {
return true;
}
-
+
@Override
public String getName() {
- return _name;
+ return _name;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/async/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
index 25b7e60..1446236 100644
--- a/server/src/com/cloud/async/AsyncJobManagerImpl.java
+++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -35,7 +35,11 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.response.ExceptionResponse;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.springframework.stereotype.Component;
@@ -43,15 +47,10 @@ import org.springframework.stereotype.Component;
import com.cloud.api.ApiDispatcher;
import com.cloud.api.ApiGsonHelper;
import com.cloud.api.ApiSerializerHelper;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.ExceptionResponse;
import com.cloud.async.dao.AsyncJobDao;
import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterManagerListener;
import com.cloud.cluster.ManagementServerHostVO;
-import com.cloud.cluster.StackMaid;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.exception.InvalidParameterValueException;
@@ -64,7 +63,6 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.PropertiesUtil;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
@@ -80,14 +78,14 @@ import com.google.gson.reflect.TypeToken;
@Local(value={AsyncJobManager.class})
public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListener {
public static final Logger s_logger = Logger.getLogger(AsyncJobManagerImpl.class.getName());
- private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 3; // 3 seconds
-
+ private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 3; // 3 seconds
+
private static final int MAX_ONETIME_SCHEDULE_SIZE = 50;
private static final int HEARTBEAT_INTERVAL = 2000;
private static final int GC_INTERVAL = 10000; // 10 seconds
-
+
private String _name;
-
+
@Inject private AsyncJobExecutorContext _context;
@Inject private SyncQueueManager _queueMgr;
@Inject private ClusterManager _clusterMgr;
@@ -97,201 +95,201 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
@Inject private ConfigurationDao _configDao;
private long _jobExpireSeconds = 86400; // 1 day
private long _jobCancelThresholdSeconds = 3600; // 1 hour (for cancelling the jobs blocking other jobs)
-
- private ApiDispatcher _dispatcher;
+
+ @Inject private ApiDispatcher _dispatcher;
private final ScheduledExecutorService _heartbeatScheduler =
- Executors.newScheduledThreadPool(1, new NamedThreadFactory("AsyncJobMgr-Heartbeat"));
+ Executors.newScheduledThreadPool(1, new NamedThreadFactory("AsyncJobMgr-Heartbeat"));
private ExecutorService _executor;
@Override
- public AsyncJobExecutorContext getExecutorContext() {
- return _context;
- }
-
+ public AsyncJobExecutorContext getExecutorContext() {
+ return _context;
+ }
+
@Override
- public AsyncJobVO getAsyncJob(long jobId) {
- return _jobDao.findById(jobId);
+ public AsyncJobVO getAsyncJob(long jobId) {
+ return _jobDao.findById(jobId);
}
-
+
@Override
- public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
- return _jobDao.findInstancePendingAsyncJob(instanceType, instanceId);
+ public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
+ return _jobDao.findInstancePendingAsyncJob(instanceType, instanceId);
}
-
+
@Override
public List<AsyncJobVO> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) {
- return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId);
+ return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId);
}
-
+
@Override
- public long submitAsyncJob(AsyncJobVO job) {
- return submitAsyncJob(job, false);
+ public long submitAsyncJob(AsyncJobVO job) {
+ return submitAsyncJob(job, false);
}
@Override @DB
public long submitAsyncJob(AsyncJobVO job, boolean scheduleJobExecutionInContext) {
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
- job.setInitMsid(getMsid());
- _jobDao.persist(job);
- txt.commit();
-
- // no sync source originally
- job.setSyncSource(null);
- scheduleExecution(job, scheduleJobExecutionInContext);
- if(s_logger.isDebugEnabled()) {
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+ job.setInitMsid(getMsid());
+ _jobDao.persist(job);
+ txt.commit();
+
+ // no sync source originally
+ job.setSyncSource(null);
+ scheduleExecution(job, scheduleJobExecutionInContext);
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("submit async job-" + job.getId() + ", details: " + job.toString());
}
- return job.getId();
- } catch(Exception e) {
- txt.rollback();
- String errMsg = "Unable to schedule async job for command " + job.getCmd() + ", unexpected exception.";
+ return job.getId();
+ } catch(Exception e) {
+ txt.rollback();
+ String errMsg = "Unable to schedule async job for command " + job.getCmd() + ", unexpected exception.";
s_logger.warn(errMsg, e);
throw new CloudRuntimeException(errMsg);
- }
+ }
}
@Override @DB
public void completeAsyncJob(long jobId, int jobStatus, int resultCode, Object resultObject) {
- if(s_logger.isDebugEnabled()) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Complete async job-" + jobId + ", jobStatus: " + jobStatus +
- ", resultCode: " + resultCode + ", result: " + resultObject);
+ ", resultCode: " + resultCode + ", result: " + resultObject);
}
-
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
- if(job == null) {
- if(s_logger.isDebugEnabled()) {
+
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+ AsyncJobVO job = _jobDao.findById(jobId);
+ if(job == null) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus +
- ", resultCode: " + resultCode + ", result: " + resultObject);
+ ", resultCode: " + resultCode + ", result: " + resultObject);
}
-
- txt.rollback();
- return;
- }
+
+ txt.rollback();
+ return;
+ }
- job.setCompleteMsid(getMsid());
- job.setStatus(jobStatus);
- job.setResultCode(resultCode);
+ job.setCompleteMsid(getMsid());
+ job.setStatus(jobStatus);
+ job.setResultCode(resultCode);
- // reset attached object
- job.setInstanceType(null);
- job.setInstanceId(null);
+ // reset attached object
+ job.setInstanceType(null);
+ job.setInstanceId(null);
- if (resultObject != null) {
+ if (resultObject != null) {
job.setResult(ApiSerializerHelper.toSerializedStringOld(resultObject));
- }
-
- job.setLastUpdated(DateUtil.currentGMTTime());
- _jobDao.update(jobId, job);
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception while completing async job-" + jobId, e);
- txt.rollback();
- }
+ }
+
+ job.setLastUpdated(DateUtil.currentGMTTime());
+ _jobDao.update(jobId, job);
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception while completing async job-" + jobId, e);
+ txt.rollback();
+ }
}
@Override @DB
public void updateAsyncJobStatus(long jobId, int processStatus, Object resultObject) {
- if(s_logger.isDebugEnabled()) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Update async-job progress, job-" + jobId + ", processStatus: " + processStatus +
- ", result: " + resultObject);
+ ", result: " + resultObject);
}
-
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
- if(job == null) {
- if(s_logger.isDebugEnabled()) {
+
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+ AsyncJobVO job = _jobDao.findById(jobId);
+ if(job == null) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("job-" + jobId + " no longer exists, we just log progress info here. progress status: " + processStatus);
}
-
- txt.rollback();
- return;
- }
-
- job.setProcessStatus(processStatus);
- if(resultObject != null) {
+
+ txt.rollback();
+ return;
+ }
+
+ job.setProcessStatus(processStatus);
+ if(resultObject != null) {
job.setResult(ApiSerializerHelper.toSerializedStringOld(resultObject));
}
- job.setLastUpdated(DateUtil.currentGMTTime());
- _jobDao.update(jobId, job);
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception while updating async job-" + jobId + " status: ", e);
- txt.rollback();
- }
+ job.setLastUpdated(DateUtil.currentGMTTime());
+ _jobDao.update(jobId, job);
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception while updating async job-" + jobId + " status: ", e);
+ txt.rollback();
+ }
}
@Override @DB
public void updateAsyncJobAttachment(long jobId, String instanceType, Long instanceId) {
- if(s_logger.isDebugEnabled()) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Update async-job attachment, job-" + jobId + ", instanceType: " + instanceType +
- ", instanceId: " + instanceId);
+ ", instanceId: " + instanceId);
+ }
+
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+
+ AsyncJobVO job = _jobDao.createForUpdate();
+ //job.setInstanceType(instanceType);
+ job.setInstanceId(instanceId);
+ job.setLastUpdated(DateUtil.currentGMTTime());
+ _jobDao.update(jobId, job);
+
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception while updating async job-" + jobId + " attachment: ", e);
+ txt.rollback();
}
-
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
-
- AsyncJobVO job = _jobDao.createForUpdate();
- //job.setInstanceType(instanceType);
- job.setInstanceId(instanceId);
- job.setLastUpdated(DateUtil.currentGMTTime());
- _jobDao.update(jobId, job);
-
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception while updating async job-" + jobId + " attachment: ", e);
- txt.rollback();
- }
}
@Override
public void syncAsyncJobExecution(AsyncJob job, String syncObjType, long syncObjId, long queueSizeLimit) {
- // This method is re-entrant. If an API developer wants to synchronized on an object, e.g. the router,
- // when executing business logic, they will call this method (actually a method in BaseAsyncCmd that calls this).
- // This method will get called every time their business logic executes. The first time it exectues for a job
- // there will be no sync source, but on subsequent execution there will be a sync souce. If this is the first
- // time the job executes we queue the job, otherwise we just return so that the business logic can execute.
+ // This method is re-entrant. If an API developer wants to synchronized on an object, e.g. the router,
+ // when executing business logic, they will call this method (actually a method in BaseAsyncCmd that calls this).
+ // This method will get called every time their business logic executes. The first time it exectues for a job
+ // there will be no sync source, but on subsequent execution there will be a sync souce. If this is the first
+ // time the job executes we queue the job, otherwise we just return so that the business logic can execute.
if (job.getSyncSource() != null) {
return;
}
-
+
if(s_logger.isDebugEnabled()) {
s_logger.debug("Sync job-" + job.getId() + " execution on object " + syncObjType + "." + syncObjId);
}
- SyncQueueVO queue = null;
+ SyncQueueVO queue = null;
- // to deal with temporary DB exceptions like DB deadlock/Lock-wait time out cased rollbacks
- // we retry five times until we throw an exception
- Random random = new Random();
+ // to deal with temporary DB exceptions like DB deadlock/Lock-wait time out cased rollbacks
+ // we retry five times until we throw an exception
+ Random random = new Random();
- for(int i = 0; i < 5; i++) {
+ for(int i = 0; i < 5; i++) {
queue = _queueMgr.queue(syncObjType, syncObjId, SyncQueueItem.AsyncJobContentType, job.getId(), queueSizeLimit);
- if(queue != null) {
+ if(queue != null) {
break;
}
- try {
- Thread.sleep(1000 + random.nextInt(5000));
- } catch (InterruptedException e) {
- }
- }
+ try {
+ Thread.sleep(1000 + random.nextInt(5000));
+ } catch (InterruptedException e) {
+ }
+ }
- if (queue == null) {
+ if (queue == null) {
throw new CloudRuntimeException("Unable to insert queue item into database, DB is full?");
- } else {
- throw new AsyncCommandQueued(queue, "job-" + job.getId() + " queued");
- }
+ } else {
+ throw new AsyncCommandQueued(queue, "job-" + job.getId() + " queued");
+ }
}
-
+
@Override
public AsyncJob queryAsyncJobResult(QueryAsyncJobResultCmd cmd) {
Account caller = UserContext.current().getCaller();
@@ -300,10 +298,10 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
if (job == null) {
throw new InvalidParameterValueException("Unable to find a job by id " + cmd.getId());
}
-
+
User userJobOwner = _accountMgr.getUserIncludingRemoved(job.getUserId());
Account jobOwner = _accountMgr.getAccount(userJobOwner.getAccountId());
-
+
//check permissions
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
//regular user can see only jobs he owns
@@ -313,7 +311,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
} else if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
_accountMgr.checkAccess(caller, null, true, jobOwner);
}
-
+
//poll the job
queryAsyncJobResult(cmd.getId());
return _jobDao.findById(cmd.getId());
@@ -321,56 +319,56 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
@Override @DB
public AsyncJobResult queryAsyncJobResult(long jobId) {
- if(s_logger.isTraceEnabled()) {
+ if(s_logger.isTraceEnabled()) {
s_logger.trace("Query async-job status, job-" + jobId);
}
-
- Transaction txt = Transaction.currentTxn();
- AsyncJobResult jobResult = new AsyncJobResult(jobId);
-
- try {
- txt.start();
- AsyncJobVO job = _jobDao.findById(jobId);
- if(job != null) {
- jobResult.setCmdOriginator(job.getCmdOriginator());
- jobResult.setJobStatus(job.getStatus());
- jobResult.setProcessStatus(job.getProcessStatus());
- jobResult.setResult(job.getResult());
- jobResult.setResultCode(job.getResultCode());
- jobResult.setUuid(job.getUuid());
-
- if(job.getStatus() == AsyncJobResult.STATUS_SUCCEEDED ||
- job.getStatus() == AsyncJobResult.STATUS_FAILED) {
-
- if(s_logger.isDebugEnabled()) {
+
+ Transaction txt = Transaction.currentTxn();
+ AsyncJobResult jobResult = new AsyncJobResult(jobId);
+
+ try {
+ txt.start();
+ AsyncJobVO job = _jobDao.findById(jobId);
+ if(job != null) {
+ jobResult.setCmdOriginator(job.getCmdOriginator());
+ jobResult.setJobStatus(job.getStatus());
+ jobResult.setProcessStatus(job.getProcessStatus());
+ jobResult.setResult(job.getResult());
+ jobResult.setResultCode(job.getResultCode());
+ jobResult.setUuid(job.getUuid());
+
+ if(job.getStatus() == AsyncJobResult.STATUS_SUCCEEDED ||
+ job.getStatus() == AsyncJobResult.STATUS_FAILED) {
+
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Async job-" + jobId + " completed");
}
- } else {
- job.setLastPolled(DateUtil.currentGMTTime());
- _jobDao.update(jobId, job);
- }
- } else {
- if(s_logger.isDebugEnabled()) {
+ } else {
+ job.setLastPolled(DateUtil.currentGMTTime());
+ _jobDao.update(jobId, job);
+ }
+ } else {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Async job-" + jobId + " does not exist, invalid job id?");
}
-
- jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
- jobResult.setResult("job-" + jobId + " does not exist");
- }
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e);
-
- jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
- jobResult.setResult("Exception: " + e.toString());
- txt.rollback();
- }
-
- if(s_logger.isTraceEnabled()) {
+
+ jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
+ jobResult.setResult("job-" + jobId + " does not exist");
+ }
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e);
+
+ jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED);
+ jobResult.setResult("Exception: " + e.toString());
+ txt.rollback();
+ }
+
+ if(s_logger.isTraceEnabled()) {
s_logger.trace("Job status: " + jobResult.toString());
}
-
- return jobResult;
+
+ return jobResult;
}
private void scheduleExecution(final AsyncJobVO job) {
@@ -382,7 +380,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
if (executeInContext) {
runnable.run();
} else {
- _executor.submit(runnable);
+ _executor.submit(runnable);
}
}
@@ -392,66 +390,66 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
public void run() {
try {
long jobId = 0;
-
+
try {
- JmxUtil.registerMBean("AsyncJobManager", "Active Job " + job.getId(), new AsyncJobMBeanImpl(job));
+ JmxUtil.registerMBean("AsyncJobManager", "Active Job " + job.getId(), new AsyncJobMBeanImpl(job));
} catch(Exception e) {
- s_logger.warn("Unable to register active job " + job.getId() + " to JMX monitoring due to exception " + ExceptionUtil.toString(e));
+ s_logger.warn("Unable to register active job " + job.getId() + " to JMX monitoring due to exception " + ExceptionUtil.toString(e));
}
-
+
BaseAsyncCmd cmdObj = null;
Transaction txn = Transaction.open(Transaction.CLOUD_DB);
try {
jobId = job.getId();
NDC.push("job-" + jobId);
-
+
if(s_logger.isDebugEnabled()) {
s_logger.debug("Executing " + job.getCmd() + " for job-" + jobId);
}
-
+
Class<?> cmdClass = Class.forName(job.getCmd());
cmdObj = (BaseAsyncCmd)cmdClass.newInstance();
cmdObj.setJob(job);
-
+
Type mapType = new TypeToken<Map<String, String>>() {}.getType();
Gson gson = ApiGsonHelper.getBuilder().create();
Map<String, String> params = gson.fromJson(job.getCmdInfo(), mapType);
-
+
// whenever we deserialize, the UserContext needs to be updated
String userIdStr = params.get("ctxUserId");
String acctIdStr = params.get("ctxAccountId");
Long userId = null;
Account accountObject = null;
-
+
if (userIdStr != null) {
userId = Long.parseLong(userIdStr);
}
-
+
if (acctIdStr != null) {
accountObject = _accountDao.findById(Long.parseLong(acctIdStr));
}
-
+
UserContext.registerContext(userId, accountObject, null, false);
try {
// dispatch could ultimately queue the job
_dispatcher.dispatch(cmdObj, params);
-
+
// serialize this to the async job table
completeAsyncJob(jobId, AsyncJobResult.STATUS_SUCCEEDED, 0, cmdObj.getResponseObject());
} finally {
UserContext.unregisterContext();
}
-
+
// commands might need to be queued as part of synchronization here, so they just have to be re-dispatched from the queue mechanism...
if (job.getSyncSource() != null) {
_queueMgr.purgeItem(job.getSyncSource().getId());
checkQueue(job.getSyncSource().getQueueId());
}
-
+
if (s_logger.isDebugEnabled()) {
s_logger.debug("Done executing " + job.getCmd() + " for job-" + jobId);
}
-
+
} catch(Throwable e) {
if (e instanceof AsyncCommandQueued) {
if (s_logger.isDebugEnabled()) {
@@ -469,16 +467,16 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
errorMsg = sApiEx.getDescription();
errorCode = sApiEx.getErrorCode();
}
-
+
ExceptionResponse response = new ExceptionResponse();
response.setErrorCode(errorCode);
response.setErrorText(errorMsg);
response.setResponseName((cmdObj == null) ? "unknowncommandresponse" : cmdObj.getCommandName());
-
+
// FIXME: setting resultCode to BaseCmd.INTERNAL_ERROR is not right, usually executors have their exception handling
// and we need to preserve that as much as possible here
completeAsyncJob(jobId, AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, response);
-
+
// need to clean up any queue that happened as part of the dispatching and move on to the next item in the queue
try {
if (job.getSyncSource() != null) {
@@ -490,14 +488,13 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
}
}
} finally {
-
+
try {
- JmxUtil.unregisterMBean("AsyncJobManager", "Active Job " + job.getId());
+ JmxUtil.unregisterMBean("AsyncJobManager", "Active Job " + job.getId());
} catch(Exception e) {
- s_logger.warn("Unable to unregister active job " + job.getId() + " from JMX monitoring");
+ s_logger.warn("Unable to unregister active job " + job.getId() + " from JMX monitoring");
}
-
- StackMaid.current().exitCleanup();
+
txn.close();
NDC.pop();
}
@@ -520,17 +517,17 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
job.setFromPreviousSession(fromPreviousSession);
job.setSyncSource(item);
-
+
job.setCompleteMsid(getMsid());
_jobDao.update(job.getId(), job);
-
+
try {
- scheduleExecution(job);
- } catch(RejectedExecutionException e) {
- s_logger.warn("Execution for job-" + job.getId() + " is rejected, return it to the queue for next turn");
- _queueMgr.returnItem(item.getId());
- }
-
+ scheduleExecution(job);
+ } catch(RejectedExecutionException e) {
+ s_logger.warn("Execution for job-" + job.getId() + " is rejected, return it to the queue for next turn");
+ _queueMgr.returnItem(item.getId());
+ }
+
} else {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Unable to find related job for queue item: " + item.toString());
@@ -542,121 +539,117 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
@Override
public void releaseSyncSource(AsyncJobExecutor executor) {
- if(executor.getSyncSource() != null) {
- if(s_logger.isDebugEnabled()) {
+ if(executor.getSyncSource() != null) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Release sync source for job-" + executor.getJob().getId() + " sync source: "
- + executor.getSyncSource().getContentType() + "-"
- + executor.getSyncSource().getContentId());
+ + executor.getSyncSource().getContentType() + "-"
+ + executor.getSyncSource().getContentId());
}
-
- _queueMgr.purgeItem(executor.getSyncSource().getId());
- checkQueue(executor.getSyncSource().getQueueId());
- }
+
+ _queueMgr.purgeItem(executor.getSyncSource().getId());
+ checkQueue(executor.getSyncSource().getQueueId());
+ }
}
-
+
private void checkQueue(long queueId) {
- while(true) {
- try {
- SyncQueueItemVO item = _queueMgr.dequeueFromOne(queueId, getMsid());
- if(item != null) {
- if(s_logger.isDebugEnabled()) {
+ while(true) {
+ try {
+ SyncQueueItemVO item = _queueMgr.dequeueFromOne(queueId, getMsid());
+ if(item != null) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Executing sync queue item: " + item.toString());
}
-
- executeQueueItem(item, false);
- } else {
- break;
- }
- } catch(Throwable e) {
- s_logger.error("Unexpected exception when kicking sync queue-" + queueId, e);
- break;
- }
- }
+
+ executeQueueItem(item, false);
+ } else {
+ break;
+ }
+ } catch(Throwable e) {
+ s_logger.error("Unexpected exception when kicking sync queue-" + queueId, e);
+ break;
+ }
+ }
}
-
- private Runnable getHeartbeatTask() {
- return new Runnable() {
- @Override
+
+ private Runnable getHeartbeatTask() {
+ return new Runnable() {
+ @Override
public void run() {
- try {
- List<SyncQueueItemVO> l = _queueMgr.dequeueFromAny(getMsid(), MAX_ONETIME_SCHEDULE_SIZE);
- if(l != null && l.size() > 0) {
- for(SyncQueueItemVO item: l) {
- if(s_logger.isDebugEnabled()) {
+ try {
+ List<SyncQueueItemVO> l = _queueMgr.dequeueFromAny(getMsid(), MAX_ONETIME_SCHEDULE_SIZE);
+ if(l != null && l.size() > 0) {
+ for(SyncQueueItemVO item: l) {
+ if(s_logger.isDebugEnabled()) {
s_logger.debug("Execute sync-queue item: " + item.toString());
}
- executeQueueItem(item, false);
- }
- }
- } catch(Throwable e) {
- s_logger.error("Unexpected exception when trying to execute queue item, ", e);
- } finally {
- StackMaid.current().exitCleanup();
- }
- }
- };
- }
-
- @DB
- private Runnable getGCTask() {
- return new Runnable() {
- @Override
+ executeQueueItem(item, false);
+ }
+ }
+ } catch(Throwable e) {
+ s_logger.error("Unexpected exception when trying to execute queue item, ", e);
+ }
+ }
+ };
+ }
+
+ @DB
+ private Runnable getGCTask() {
+ return new Runnable() {
+ @Override
public void run() {
- GlobalLock scanLock = GlobalLock.getInternLock("AsyncJobManagerGC");
- try {
- if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
- try {
- reallyRun();
- } finally {
- scanLock.unlock();
- }
- }
- } finally {
- scanLock.releaseRef();
- }
- }
-
+ GlobalLock scanLock = GlobalLock.getInternLock("AsyncJobManagerGC");
+ try {
+ if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
+ try {
+ reallyRun();
+ } finally {
+ scanLock.unlock();
+ }
+ }
+ } finally {
+ scanLock.releaseRef();
+ }
+ }
+
public void reallyRun() {
- try {
- s_logger.trace("Begin cleanup expired async-jobs");
-
- Date cutTime = new Date(DateUtil.currentGMTTime().getTime() - _jobExpireSeconds*1000);
-
- // limit to 100 jobs per turn, this gives cleanup throughput as 600 jobs per minute
- // hopefully this will be fast enough to balance potential growth of job table
- List<AsyncJobVO> l = _jobDao.getExpiredJobs(cutTime, 100);
- if(l != null && l.size() > 0) {
- for(AsyncJobVO job : l) {
+ try {
+ s_logger.trace("Begin cleanup expired async-jobs");
+
+ Date cutTime = new Date(DateUtil.currentGMTTime().getTime() - _jobExpireSeconds*1000);
+
+ // limit to 100 jobs per turn, this gives cleanup throughput as 600 jobs per minute
+ // hopefully this will be fast enough to balance potential growth of job table
+ List<AsyncJobVO> l = _jobDao.getExpiredJobs(cutTime, 100);
+ if(l != null && l.size() > 0) {
+ for(AsyncJobVO job : l) {
expungeAsyncJob(job);
- }
- }
-
+ }
+ }
+
// forcefully cancel blocking queue items if they've been staying there for too long
- List<SyncQueueItemVO> blockItems = _queueMgr.getBlockedQueueItems(_jobCancelThresholdSeconds*1000, false);
- if(blockItems != null && blockItems.size() > 0) {
- for(SyncQueueItemVO item : blockItems) {
+ List<SyncQueueItemVO> blockItems = _queueMgr.getBlockedQueueItems(_jobCancelThresholdSeconds*1000, false);
+ if(blockItems != null && blockItems.size() > 0) {
+ for(SyncQueueItemVO item : blockItems) {
if(item.getContentType().equalsIgnoreCase(SyncQueueItem.AsyncJobContentType)) {
completeAsyncJob(item.getContentId(), AsyncJobResult.STATUS_FAILED, 0,
getResetResultResponse("Job is cancelled as it has been blocking others for too long"));
}
-
- // purge the item and resume queue processing
- _queueMgr.purgeItem(item.getId());
- }
- }
-
- s_logger.trace("End cleanup expired async-jobs");
- } catch(Throwable e) {
- s_logger.error("Unexpected exception when trying to execute queue item, ", e);
- } finally {
- StackMaid.current().exitCleanup();
- }
- }
-
-
- };
- }
-
+
+ // purge the item and resume queue processing
+ _queueMgr.purgeItem(item.getId());
+ }
+ }
+
+ s_logger.trace("End cleanup expired async-jobs");
+ } catch(Throwable e) {
+ s_logger.error("Unexpected exception when trying to execute queue item, ", e);
+ }
+ }
+
+
+ };
+ }
+
@DB
protected void expungeAsyncJob(AsyncJobVO job) {
Transaction txn = Transaction.currentTxn();
@@ -667,132 +660,129 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
txn.commit();
}
- private long getMsid() {
- if(_clusterMgr != null) {
+ private long getMsid() {
+ if(_clusterMgr != null) {
return _clusterMgr.getManagementNodeId();
}
-
- return MacAddress.getMacAddress().toLong();
- }
-
- private void cleanupPendingJobs(List<SyncQueueItemVO> l) {
- if(l != null && l.size() > 0) {
- for(SyncQueueItemVO item: l) {
- if(s_logger.isInfoEnabled()) {
+
+ return MacAddress.getMacAddress().toLong();
+ }
+
+ private void cleanupPendingJobs(List<SyncQueueItemVO> l) {
+ if(l != null && l.size() > 0) {
+ for(SyncQueueItemVO item: l) {
+ if(s_logger.isInfoEnabled()) {
s_logger.info("Discard left-over queue item: " + item.toString());
}
-
- String contentType = item.getContentType();
+
+ String contentType = item.getContentType();
if(contentType != null && contentType.equalsIgnoreCase(SyncQueueItem.AsyncJobContentType)) {
- Long jobId = item.getContentId();
- if(jobId != null) {
- s_logger.warn("Mark job as failed as its correspoding queue-item has been discarded. job id: " + jobId);
- completeAsyncJob(jobId, AsyncJobResult.STATUS_FAILED, 0, getResetResultResponse("Execution was cancelled because of server shutdown"));
- }
- }
- _queueMgr.purgeItem(item.getId());
- }
- }
- }
-
+ Long jobId = item.getContentId();
+ if(jobId != null) {
+ s_logger.warn("Mark job as failed as its correspoding queue-item has been discarded. job id: " + jobId);
+ completeAsyncJob(jobId, AsyncJobResult.STATUS_FAILED, 0, getResetResultResponse("Execution was cancelled because of server shutdown"));
+ }
+ }
+ _queueMgr.purgeItem(item.getId());
+ }
+ }
+ }
+
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
-
- int expireMinutes = NumbersUtil.parseInt(
- _configDao.getValue(Config.JobExpireMinutes.key()), 24*60);
- _jobExpireSeconds = (long)expireMinutes*60;
-
- _jobCancelThresholdSeconds = NumbersUtil.parseInt(
- _configDao.getValue(Config.JobCancelThresholdMinutes.key()), 60);
- _jobCancelThresholdSeconds *= 60;
-
- _dispatcher = ApiDispatcher.getInstance();
-
-
- try {
- final File dbPropsFile = PropertiesUtil.findConfigFile("db.properties");
- final Properties dbProps = new Properties();
- dbProps.load(new FileInputStream(dbPropsFile));
-
+ _name = name;
+
+ int expireMinutes = NumbersUtil.parseInt(
+ _configDao.getValue(Config.JobExpireMinutes.key()), 24*60);
+ _jobExpireSeconds = (long)expireMinutes*60;
+
+ _jobCancelThresholdSeconds = NumbersUtil.parseInt(
+ _configDao.getValue(Config.JobCancelThresholdMinutes.key()), 60);
+ _jobCancelThresholdSeconds *= 60;
+
+ try {
+ final File dbPropsFile = PropertiesUtil.findConfigFile("db.properties");
+ final Properties dbProps = new Properties();
+ dbProps.load(new FileInputStream(dbPropsFile));
+
final int cloudMaxActive = Integer.parseInt(dbProps.getProperty("db.cloud.maxActive"));
-
+
int poolSize = (cloudMaxActive * 2) / 3;
-
+
s_logger.info("Start AsyncJobManager thread pool in size " + poolSize);
_executor = Executors.newFixedThreadPool(poolSize, new NamedThreadFactory("Job-Executor"));
- } catch (final Exception e) {
- throw new ConfigurationException("Unable to load db.properties to configure AsyncJobManagerImpl");
- }
-
- return true;
+ } catch (final Exception e) {
+ throw new ConfigurationException("Unable to load db.properties to configure AsyncJobManagerImpl");
+ }
+
+ return true;
}
-
+
@Override
- public void onManagementNodeJoined(List<ManagementServerHostVO> nodeList, long selfNodeId) {
+ public void onManagementNodeJoined(List<ManagementServerHostVO> nodeList, long selfNodeId) {
}
-
+
@Override
- public void onManagementNodeLeft(List<ManagementServerHostVO> nodeList, long selfNodeId) {
- for(ManagementServerHostVO msHost : nodeList) {
- Transaction txn = Transaction.open(Transaction.CLOUD_DB);
- try {
- txn.start();
- List<SyncQueueItemVO> items = _queueMgr.getActiveQueueItems(msHost.getId(), true);
- cleanupPendingJobs(items);
- _jobDao.resetJobProcess(msHost.getId(), BaseCmd.INTERNAL_ERROR, getSerializedErrorMessage("job cancelled because of management server restart"));
- txn.commit();
- } catch(Throwable e) {
- s_logger.warn("Unexpected exception ", e);
- txn.rollback();
- } finally {
- txn.close();
- }
- }
+ public void onManagementNodeLeft(List<ManagementServerHostVO> nodeList, long selfNodeId) {
+ for(ManagementServerHostVO msHost : nodeList) {
+ Transaction txn = Transaction.open(Transaction.CLOUD_DB);
+ try {
+ txn.start();
+ List<SyncQueueItemVO> items = _queueMgr.getActiveQueueItems(msHost.getId(), true);
+ cleanupPendingJobs(items);
+ _jobDao.resetJobProcess(msHost.getId(), BaseCmd.INTERNAL_ERROR, getSerializedErrorMessage("job cancelled because of management server restart"));
+ txn.commit();
+ } catch(Throwable e) {
+ s_logger.warn("Unexpected exception ", e);
+ txn.rollback();
+ } finally {
+ txn.close();
+ }
+ }
}
-
+
@Override
- public void onManagementNodeIsolated() {
- }
+ public void onManagementNodeIsolated() {
+ }
@Override
public boolean start() {
- try {
- List<SyncQueueItemVO> l = _queueMgr.getActiveQueueItems(getMsid(), false);
- cleanupPendingJobs(l);
- _jobDao.resetJobProcess(getMsid(), BaseCmd.INTERNAL_ERROR, getSerializedErrorMessage("job cancelled because of management server restart"));
- } catch(Throwable e) {
- s_logger.error("Unexpected exception " + e.getMessage(), e);
- }
-
- _heartbeatScheduler.scheduleAtFixedRate(getHeartbeatTask(), HEARTBEAT_INTERVAL,
- HEARTBEAT_INTERVAL, TimeUnit.MILLISECONDS);
- _heartbeatScheduler.scheduleAtFixedRate(getGCTask(), GC_INTERVAL,
- GC_INTERVAL, TimeUnit.MILLISECONDS);
-
+ try {
+ List<SyncQueueItemVO> l = _queueMgr.getActiveQueueItems(getMsid(), false);
+ cleanupPendingJobs(l);
+ _jobDao.resetJobProcess(getMsid(), BaseCmd.INTERNAL_ERROR, getSerializedErrorMessage("job cancelled because of management server restart"));
+ } catch(Throwable e) {
+ s_logger.error("Unexpected exception " + e.getMessage(), e);
+ }
+
+ _heartbeatScheduler.scheduleAtFixedRate(getHeartbeatTask(), HEARTBEAT_INTERVAL,
+ HEARTBEAT_INTERVAL, TimeUnit.MILLISECONDS);
+ _heartbeatScheduler.scheduleAtFixedRate(getGCTask(), GC_INTERVAL,
+ GC_INTERVAL, TimeUnit.MILLISECONDS);
+
return true;
}
-
+
private static ExceptionResponse getResetResultResponse(String errorMessage) {
- ExceptionResponse resultObject = new ExceptionResponse();
- resultObject.setErrorCode(BaseCmd.INTERNAL_ERROR);
- resultObject.setErrorText(errorMessage);
- return resultObject;
+ ExceptionResponse resultObject = new ExceptionResponse();
+ resultObject.setErrorCode(BaseCmd.INTERNAL_ERROR);
+ resultObject.setErrorText(errorMessage);
+ return resultObject;
}
-
+
private static String getSerializedErrorMessage(String errorMessage) {
return ApiSerializerHelper.toSerializedStringOld(getResetResultResponse(errorMessage));
}
@Override
public boolean stop() {
- _heartbeatScheduler.shutdown();
- _executor.shutdown();
+ _heartbeatScheduler.shutdown();
+ _executor.shutdown();
return true;
}
-
+
@Override
public String getName() {
- return _name;
+ return _name;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/async/SyncQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/SyncQueueManagerImpl.java b/server/src/com/cloud/async/SyncQueueManagerImpl.java
index 97ce8a6..4f0daa0 100644
--- a/server/src/com/cloud/async/SyncQueueManagerImpl.java
+++ b/server/src/com/cloud/async/SyncQueueManagerImpl.java
@@ -31,7 +31,6 @@ import org.springframework.stereotype.Component;
import com.cloud.async.dao.SyncQueueDao;
import com.cloud.async.dao.SyncQueueItemDao;
import com.cloud.utils.DateUtil;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@@ -40,9 +39,9 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Local(value={SyncQueueManager.class})
public class SyncQueueManagerImpl implements SyncQueueManager {
public static final Logger s_logger = Logger.getLogger(SyncQueueManagerImpl.class.getName());
-
+
private String _name;
-
+
@Inject private SyncQueueDao _syncQueueDao;
@Inject private SyncQueueItemDao _syncQueueItemDao;
@@ -50,203 +49,203 @@ public class SyncQueueManagerImpl implements SyncQueueManager {
@DB
public SyncQueueVO queue(String syncObjType, long syncObjId, String itemType, long itemId, long queueSizeLimit) {
Transaction txn = Transaction.currentTxn();
- try {
- txn.start();
-
- _syncQueueDao.ensureQueue(syncObjType, syncObjId);
- SyncQueueVO queueVO = _syncQueueDao.find(syncObjType, syncObjId);
- if(queueVO == null)
- throw new CloudRuntimeException("Unable to queue item into DB, DB is full?");
-
- queueVO.setQueueSizeLimit(queueSizeLimit);
- _syncQueueDao.update(queueVO.getId(), queueVO);
-
- Date dt = DateUtil.currentGMTTime();
- SyncQueueItemVO item = new SyncQueueItemVO();
- item.setQueueId(queueVO.getId());
- item.setContentType(itemType);
- item.setContentId(itemId);
- item.setCreated(dt);
-
- _syncQueueItemDao.persist(item);
- txn.commit();
-
- return queueVO;
- } catch(Exception e) {
- s_logger.error("Unexpected exception: ", e);
- txn.rollback();
- }
- return null;
+ try {
+ txn.start();
+
+ _syncQueueDao.ensureQueue(syncObjType, syncObjId);
+ SyncQueueVO queueVO = _syncQueueDao.find(syncObjType, syncObjId);
+ if(queueVO == null)
+ throw new CloudRuntimeException("Unable to queue item into DB, DB is full?");
+
+ queueVO.setQueueSizeLimit(queueSizeLimit);
+ _syncQueueDao.update(queueVO.getId(), queueVO);
+
+ Date dt = DateUtil.currentGMTTime();
+ SyncQueueItemVO item = new SyncQueueItemVO();
+ item.setQueueId(queueVO.getId());
+ item.setContentType(itemType);
+ item.setContentId(itemId);
+ item.setCreated(dt);
+
+ _syncQueueItemDao.persist(item);
+ txn.commit();
+
+ return queueVO;
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ txn.rollback();
+ }
+ return null;
}
-
+
@Override
@DB
public SyncQueueItemVO dequeueFromOne(long queueId, Long msid) {
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
-
- SyncQueueVO queueVO = _syncQueueDao.lockRow(queueId, true);
- if(queueVO == null) {
- s_logger.error("Sync queue(id: " + queueId + ") does not exist");
- txt.commit();
- return null;
- }
-
- if(queueReadyToProcess(queueVO)) {
- SyncQueueItemVO itemVO = _syncQueueItemDao.getNextQueueItem(queueVO.getId());
- if(itemVO != null) {
- Long processNumber = queueVO.getLastProcessNumber();
- if(processNumber == null)
- processNumber = new Long(1);
- else
- processNumber = processNumber + 1;
- Date dt = DateUtil.currentGMTTime();
- queueVO.setLastProcessNumber(processNumber);
- queueVO.setLastUpdated(dt);
- queueVO.setQueueSize(queueVO.getQueueSize() + 1);
- _syncQueueDao.update(queueVO.getId(), queueVO);
-
- itemVO.setLastProcessMsid(msid);
- itemVO.setLastProcessNumber(processNumber);
- itemVO.setLastProcessTime(dt);
- _syncQueueItemDao.update(itemVO.getId(), itemVO);
-
- txt.commit();
- return itemVO;
- } else {
- if(s_logger.isDebugEnabled())
- s_logger.debug("Sync queue (" + queueId + ") is currently empty");
- }
- } else {
- if(s_logger.isDebugEnabled())
- s_logger.debug("There is a pending process in sync queue(id: " + queueId + ")");
- }
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception: ", e);
- txt.rollback();
- }
-
- return null;
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+
+ SyncQueueVO queueVO = _syncQueueDao.lockRow(queueId, true);
+ if(queueVO == null) {
+ s_logger.error("Sync queue(id: " + queueId + ") does not exist");
+ txt.commit();
+ return null;
+ }
+
+ if(queueReadyToProcess(queueVO)) {
+ SyncQueueItemVO itemVO = _syncQueueItemDao.getNextQueueItem(queueVO.getId());
+ if(itemVO != null) {
+ Long processNumber = queueVO.getLastProcessNumber();
+ if(processNumber == null)
+ processNumber = new Long(1);
+ else
+ processNumber = processNumber + 1;
+ Date dt = DateUtil.currentGMTTime();
+ queueVO.setLastProcessNumber(processNumber);
+ queueVO.setLastUpdated(dt);
+ queueVO.setQueueSize(queueVO.getQueueSize() + 1);
+ _syncQueueDao.update(queueVO.getId(), queueVO);
+
+ itemVO.setLastProcessMsid(msid);
+ itemVO.setLastProcessNumber(processNumber);
+ itemVO.setLastProcessTime(dt);
+ _syncQueueItemDao.update(itemVO.getId(), itemVO);
+
+ txt.commit();
+ return itemVO;
+ } else {
+ if(s_logger.isDebugEnabled())
+ s_logger.debug("Sync queue (" + queueId + ") is currently empty");
+ }
+ } else {
+ if(s_logger.isDebugEnabled())
+ s_logger.debug("There is a pending process in sync queue(id: " + queueId + ")");
+ }
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ txt.rollback();
+ }
+
+ return null;
}
-
+
@Override
@DB
public List<SyncQueueItemVO> dequeueFromAny(Long msid, int maxItems) {
-
- List<SyncQueueItemVO> resultList = new ArrayList<SyncQueueItemVO>();
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
-
- List<SyncQueueItemVO> l = _syncQueueItemDao.getNextQueueItems(maxItems);
- if(l != null && l.size() > 0) {
- for(SyncQueueItemVO item : l) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(item.getQueueId(), true);
- SyncQueueItemVO itemVO = _syncQueueItemDao.lockRow(item.getId(), true);
- if(queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) {
- Long processNumber = queueVO.getLastProcessNumber();
- if(processNumber == null)
- processNumber = new Long(1);
- else
- processNumber = processNumber + 1;
-
- Date dt = DateUtil.currentGMTTime();
- queueVO.setLastProcessNumber(processNumber);
- queueVO.setLastUpdated(dt);
- queueVO.setQueueSize(queueVO.getQueueSize() + 1);
- _syncQueueDao.update(queueVO.getId(), queueVO);
-
- itemVO.setLastProcessMsid(msid);
- itemVO.setLastProcessNumber(processNumber);
- itemVO.setLastProcessTime(dt);
- _syncQueueItemDao.update(item.getId(), itemVO);
-
- resultList.add(item);
- }
- }
- }
- txt.commit();
- return resultList;
- } catch(Exception e) {
- s_logger.error("Unexpected exception: ", e);
- txt.rollback();
- }
- return null;
+
+ List<SyncQueueItemVO> resultList = new ArrayList<SyncQueueItemVO>();
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+
+ List<SyncQueueItemVO> l = _syncQueueItemDao.getNextQueueItems(maxItems);
+ if(l != null && l.size() > 0) {
+ for(SyncQueueItemVO item : l) {
+ SyncQueueVO queueVO = _syncQueueDao.lockRow(item.getQueueId(), true);
+ SyncQueueItemVO itemVO = _syncQueueItemDao.lockRow(item.getId(), true);
+ if(queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) {
+ Long processNumber = queueVO.getLastProcessNumber();
+ if(processNumber == null)
+ processNumber = new Long(1);
+ else
+ processNumber = processNumber + 1;
+
+ Date dt = DateUtil.currentGMTTime();
+ queueVO.setLastProcessNumber(processNumber);
+ queueVO.setLastUpdated(dt);
+ queueVO.setQueueSize(queueVO.getQueueSize() + 1);
+ _syncQueueDao.update(queueVO.getId(), queueVO);
+
+ itemVO.setLastProcessMsid(msid);
+ itemVO.setLastProcessNumber(processNumber);
+ itemVO.setLastProcessTime(dt);
+ _syncQueueItemDao.update(item.getId(), itemVO);
+
+ resultList.add(item);
+ }
+ }
+ }
+ txt.commit();
+ return resultList;
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ txt.rollback();
+ }
+ return null;
}
-
+
@Override
@DB
public void purgeItem(long queueItemId) {
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
-
- SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
- if(itemVO != null) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
-
- _syncQueueItemDao.expunge(itemVO.getId());
-
- //if item is active, reset queue information
- if (itemVO.getLastProcessMsid() != null) {
- queueVO.setLastUpdated(DateUtil.currentGMTTime());
- //decrement the count
- assert (queueVO.getQueueSize() > 0) : "Count reduce happens when it's already <= 0!";
- queueVO.setQueueSize(queueVO.getQueueSize() - 1);
- _syncQueueDao.update(queueVO.getId(), queueVO);
- }
- }
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception: ", e);
- txt.rollback();
- }
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+
+ SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
+ if(itemVO != null) {
+ SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
+
+ _syncQueueItemDao.expunge(itemVO.getId());
+
+ //if item is active, reset queue information
+ if (itemVO.getLastProcessMsid() != null) {
+ queueVO.setLastUpdated(DateUtil.currentGMTTime());
+ //decrement the count
+ assert (queueVO.getQueueSize() > 0) : "Count reduce happens when it's already <= 0!";
+ queueVO.setQueueSize(queueVO.getQueueSize() - 1);
+ _syncQueueDao.update(queueVO.getId(), queueVO);
+ }
+ }
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ txt.rollback();
+ }
}
-
+
@Override
@DB
public void returnItem(long queueItemId) {
- Transaction txt = Transaction.currentTxn();
- try {
- txt.start();
-
- SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
- if(itemVO != null) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
-
- itemVO.setLastProcessMsid(null);
- itemVO.setLastProcessNumber(null);
- itemVO.setLastProcessTime(null);
- _syncQueueItemDao.update(queueItemId, itemVO);
-
- queueVO.setLastUpdated(DateUtil.currentGMTTime());
- _syncQueueDao.update(queueVO.getId(), queueVO);
- }
- txt.commit();
- } catch(Exception e) {
- s_logger.error("Unexpected exception: ", e);
- txt.rollback();
- }
+ Transaction txt = Transaction.currentTxn();
+ try {
+ txt.start();
+
+ SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
+ if(itemVO != null) {
+ SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
+
+ itemVO.setLastProcessMsid(null);
+ itemVO.setLastProcessNumber(null);
+ itemVO.setLastProcessTime(null);
+ _syncQueueItemDao.update(queueItemId, itemVO);
+
+ queueVO.setLastUpdated(DateUtil.currentGMTTime());
+ _syncQueueDao.update(queueVO.getId(), queueVO);
+ }
+ txt.commit();
+ } catch(Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ txt.rollback();
+ }
}
-
+
@Override
- public List<SyncQueueItemVO> getActiveQueueItems(Long msid, boolean exclusive) {
- return _syncQueueItemDao.getActiveQueueItems(msid, exclusive);
+ public List<SyncQueueItemVO> getActiveQueueItems(Long msid, boolean exclusive) {
+ return _syncQueueItemDao.getActiveQueueItems(msid, exclusive);
}
-
+
@Override
public List<SyncQueueItemVO> getBlockedQueueItems(long thresholdMs, boolean exclusive) {
return _syncQueueItemDao.getBlockedQueueItems(thresholdMs, exclusive);
}
-
+
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
- return true;
+ _name = name;
+ return true;
}
-
+
@Override
public boolean start() {
return true;
@@ -256,16 +255,16 @@ public class SyncQueueManagerImpl implements SyncQueueManager {
public boolean stop() {
return true;
}
-
+
@Override
public String getName() {
- return _name;
+ return _name;
}
private boolean queueReadyToProcess(SyncQueueVO queueVO) {
return queueVO.getQueueSize() < queueVO.getQueueSizeLimit();
}
-
+
@Override
public void purgeAsyncJobQueueItemId(long asyncJobId) {
Long itemId = _syncQueueItemDao.getQueueItemIdByContentIdAndType(asyncJobId, SyncQueueItem.AsyncJobContentType);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
index 8ee21f3..d2d2929 100644
--- a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
+++ b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Component;
import com.cloud.async.SyncQueueItemVO;
import com.cloud.utils.DateUtil;
+import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@@ -43,6 +44,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = { SyncQueueItemDao.class })
+@DB
public class SyncQueueItemDaoImpl extends GenericDaoBase<SyncQueueItemVO, Long> implements SyncQueueItemDao {
private static final Logger s_logger = Logger.getLogger(SyncQueueItemDaoImpl.class);
final GenericSearchBuilder<SyncQueueItemVO, Long> queueIdSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
index 1ce9b33..35983fa 100755
--- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
+++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
@@ -40,6 +40,9 @@ import com.cloud.agent.api.baremetal.IpmISetBootDevCommand;
import com.cloud.agent.api.baremetal.IpmiBootorResetCommand;
import com.cloud.agent.manager.Commands;
import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
import com.cloud.baremetal.PxeServerManager.PxeServerType;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
@@ -81,7 +84,7 @@ import com.cloud.user.UserContext;
import com.cloud.uservm.UserVm;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Adapters;
+import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
@@ -102,6 +105,8 @@ import com.cloud.vm.VirtualMachineName;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfile.Param;
+@Component
+@Primary
@Local(value={BareMetalVmManager.class, BareMetalVmService.class})
public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMetalVmManager, BareMetalVmService, Manager,
StateListener<State, VirtualMachine.Event, VirtualMachine> {
@@ -110,7 +115,6 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
@Inject PxeServerManager _pxeMgr;
@Inject ResourceManager _resourceMgr;
- // @com.cloud.utils.component.Inject (adapter=TemplateAdapter.class)
@Inject protected List<TemplateAdapter> _adapters;
@PostConstruct
@@ -181,7 +185,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
* prepare() will check if current account has right for creating
* template
*/
- TemplateAdapter adapter = Adapters.getAdapterByName(_adapters, TemplateAdapterType.BareMetal.getName());
+ TemplateAdapter adapter = AdapterBase.getAdapterByName(_adapters, TemplateAdapterType.BareMetal.getName());
Long userId = UserContext.current().getCallerUserId();
userId = (userId == null ? User.UID_SYSTEM : userId);
AccountVO account = _accountDao.findById(vm.getAccountId());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/110465b5/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
index 6e123af..7a9a783 100755
--- a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
+++ b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
@@ -41,7 +41,7 @@ import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.uservm.UserVm;
-import com.cloud.utils.component.Adapters;
+import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
@@ -87,7 +87,7 @@ public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdap
protected PxeServerService getServiceByType(String type) {
PxeServerService _service;
- _service = Adapters.getAdapterByName(_services, type);
+ _service = AdapterBase.getAdapterByName(_services, type);
if (_service == null) {
throw new CloudRuntimeException("Cannot find PXE service for " + type);
}