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

CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale

This commit is contained in:
Harikrishna Patnala 2013-12-30 11:45:24 +05:30 committed by Kishan Kavala
parent 5551724a2e
commit 662383e24b
5 changed files with 69 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
View File

@ -53,6 +53,10 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
private static final String COPY_ALL_EVENTS = "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) " +
"SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id <= ?";
private static final String MAX_EVENT = "select max(id) from cloud.usage_event where created <= ?";
private static final String COPY_EVENT_DETAILS = "INSERT INTO cloud_usage.usage_event_details (id, usage_event_id, name, value) " +
"SELECT id, usage_event_id, name, value FROM cloud.usage_event_details vmevtDetails WHERE vmevtDetails.usage_event_id > ? and vmevtDetails.usage_event_id <= ? ";
private static final String COPY_ALL_EVENT_DETAILS = "INSERT INTO cloud_usage.usage_event_details (id, usage_event_id, name, value) " +
"SELECT id, usage_event_id, name, value FROM cloud.usage_event_details vmevtDetails WHERE vmevtDetails.usage_event_id <= ?";
@Inject protected UsageEventDetailsDao usageEventDetailsDao;
public UsageEventDaoImpl () {
@ -93,6 +97,7 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
long recentEventId = getMostRecentEventId();
long maxEventId = getMaxEventId(endDate);
TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
// Copy events from cloud db to usage db
String sql = COPY_EVENTS;
if (recentEventId == 0) {
if (s_logger.isDebugEnabled()) {
@ -112,12 +117,39 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
pstmt.setLong(i++, maxEventId);
pstmt.executeUpdate();
txn.commit();
return findRecentEvents(endDate);
} catch (Exception ex) {
txn.rollback();
s_logger.error("error copying events from cloud db to usage db", ex);
throw new CloudRuntimeException(ex.getMessage());
}
// Copy event details from cloud db to usage db
sql = COPY_EVENT_DETAILS;
if (recentEventId == 0) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("no recent event date, copying all event detailss");
}
sql = COPY_ALL_EVENT_DETAILS;
}
pstmt = null;
try {
txn.start();
pstmt = txn.prepareAutoCloseStatement(sql);
int i = 1;
if (recentEventId != 0) {
pstmt.setLong(i++, recentEventId);
}
pstmt.setLong(i++, maxEventId);
pstmt.executeUpdate();
txn.commit();
} catch (Exception ex) {
txn.rollback();
s_logger.error("error copying event details from cloud db to usage db", ex);
throw new CloudRuntimeException(ex.getMessage());
}
return findRecentEvents(endDate);
}
@DB

1
engine/schema/src/com/cloud/event/dao/UsageEventDetailsDao.java
View File

@ -23,7 +23,6 @@ import com.cloud.utils.db.GenericDao;
public interface UsageEventDetailsDao extends GenericDao<UsageEventDetailsVO, Long> {
Map<String, String> findDetails(long eventId);
void persist(long eventId, Map<String, String> details);

41
engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
View File

@ -39,8 +39,6 @@ import java.util.Map;
public class UsageEventDetailsDaoImpl extends GenericDaoBase<UsageEventDetailsVO, Long> implements UsageEventDetailsDao {
public static final Logger s_logger = Logger.getLogger(UsageEventDetailsDaoImpl.class.getName());
private static final String EVENT_DETAILS_QUERY = "SELECT details.id, details.usage_event_id, details.name, details.value FROM `cloud`.`usage_event_details` details WHERE details.usage_event_id = ?";
protected final SearchBuilder<UsageEventDetailsVO> EventDetailsSearch;
protected final SearchBuilder<UsageEventDetailsVO> DetailSearch;
@ -78,45 +76,6 @@ public class UsageEventDetailsDaoImpl extends GenericDaoBase<UsageEventDetailsVO
return findOneBy(sc);
}
@Override
public Map<String, String> findDetails(long eventId) {
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet resultSet = null;
Map<String, String> details = new HashMap<String, String>();
try {
conn = TransactionLegacy.getStandaloneConnection();
pstmt = conn.prepareStatement(EVENT_DETAILS_QUERY);
pstmt.setLong(1, eventId);
resultSet = pstmt.executeQuery();
while (resultSet.next()) {
details.put(resultSet.getString(3), resultSet.getString(4));
}
} catch (SQLException e) {
throw new CloudRuntimeException("Error while executing SQL prepared statement", e);
} catch (Throwable e) {
throw new CloudRuntimeException("Caught: " + e);
} finally {
if (pstmt != null) {
try {
pstmt.close();
} catch (SQLException e) {
}
}
if (conn != null) {
try {
conn.close();
} catch (SQLException e) {
}
}
}
return details;
}
@Override
public void persist(long eventId, Map<String, String> details) {
TransactionLegacy txn = TransactionLegacy.currentTxn();

9
setup/db/db/schema-421to430.sql
View File

@ -646,6 +646,15 @@ CREATE TABLE `cloud`.`usage_event_details` (
CONSTRAINT `fk_usage_event_details__usage_event_id` FOREIGN KEY `fk_usage_event_details__usage_event_id`(`usage_event_id`) REFERENCES `usage_event`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud_usage`.`usage_event_details` (
`id` bigint unsigned NOT NULL auto_increment,
`usage_event_id` bigint unsigned NOT NULL COMMENT 'usage event id',
`name` varchar(255) NOT NULL,
`value` varchar(1024) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `fk_usage_event_details__usage_event_id` FOREIGN KEY `fk_usage_event_details__usage_event_id`(`usage_event_id`) REFERENCES `usage_event`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`user_ip_address_details` (
`id` bigint unsigned NOT NULL auto_increment,
`user_ip_address_id` bigint unsigned NOT NULL COMMENT 'User ip address id',

60
usage/src/com/cloud/usage/UsageManagerImpl.java
View File

@ -34,6 +34,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.event.UsageEventDetailsVO;
import com.cloud.service.ServiceOfferingVO;
import org.apache.log4j.Logger;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@ -1028,7 +1029,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
usageInstance.setServiceOfferingId(soId);
usageInstance.setStartDate(event.getCreateDate());
usageInstance.setEndDate(null);
m_usageInstanceDao.persist(usageInstance);
populateDynamicComputeOfferingDetailsAndPersist(usageInstance, event.getId());
}
}
@ -1039,7 +1040,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
// add this VM to the usage helper table
UsageVMInstanceVO usageInstanceNew = new UsageVMInstanceVO(UsageTypes.RUNNING_VM, zoneId, event.getAccountId(), vmId, vmName,
soId, templateId, hypervisorType, event.getCreateDate(), null);
m_usageInstanceDao.persist(usageInstanceNew);
populateDynamicComputeOfferingDetailsAndPersist(usageInstanceNew, event.getId());
} catch (Exception ex) {
s_logger.error("Error saving usage instance for vm: " + vmId, ex);
}
@ -1066,38 +1067,11 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
try {
Long templateId = event.getTemplateId();
String hypervisorType = event.getResourceType();
Long cpuCores= null;
Long memory = null;
Long cpuSpeed = null;
//populate the cpu, memory and cpuSpeed of the vm when created from a dynamic offering.
Map<String, String> usageDetails = _usageEventDetailsDao.findDetails(event.getId());
if (usageDetails != null && usageDetails.size() != 0) {
if (usageDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name()) != null) {
cpuCores = Long.parseLong(usageDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name()));
}
if (usageDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name()) != null) {
cpuSpeed = Long.parseLong(usageDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name()));
}
if (usageDetails.get(UsageEventVO.DynamicParameters.memory.name()) != null) {
memory = Long.parseLong(usageDetails.get(UsageEventVO.DynamicParameters.memory.name()));
}
}
// add this VM to the usage helper table
UsageVMInstanceVO usageInstanceNew = new UsageVMInstanceVO(UsageTypes.ALLOCATED_VM, zoneId, event.getAccountId(), vmId, vmName,
soId, templateId, hypervisorType, event.getCreateDate(), null);
if (cpuCores != null) {
usageInstanceNew.setCpuCores(cpuCores);
}
if (cpuSpeed != null) {
usageInstanceNew.setCpuSpeed(cpuSpeed);
}
if (memory != null) {
usageInstanceNew.setMemory(memory);
}
m_usageInstanceDao.persist(usageInstanceNew);
populateDynamicComputeOfferingDetailsAndPersist(usageInstanceNew, event.getId());
} catch (Exception ex) {
s_logger.error("Error saving usage instance for vm: " + vmId, ex);
}
@ -1137,7 +1111,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
// add this VM to the usage helper table
UsageVMInstanceVO usageInstanceNew = new UsageVMInstanceVO(UsageTypes.ALLOCATED_VM, zoneId, event.getAccountId(), vmId, vmName,
soId, templateId, hypervisorType, event.getCreateDate(), null);
m_usageInstanceDao.persist(usageInstanceNew);
populateDynamicComputeOfferingDetailsAndPersist(usageInstanceNew, event.getId());
} else if (EventTypes.EVENT_VM_DYNAMIC_SCALE.equals(event.getType())) {
// Ending the running vm event
SearchCriteria<UsageVMInstanceVO> sc = m_usageInstanceDao.createSearchCriteria();
@ -1172,7 +1146,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
usageInstance.setServiceOfferingId(soId);
usageInstance.setStartDate(event.getCreateDate());
usageInstance.setEndDate(null);
m_usageInstanceDao.persist(usageInstance);
populateDynamicComputeOfferingDetailsAndPersist(usageInstance, event.getId());
}
}
@ -1182,10 +1156,30 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
// add this VM to the usage helper table with new service offering Id
UsageVMInstanceVO usageInstanceNew = new UsageVMInstanceVO(UsageTypes.RUNNING_VM, zoneId, event.getAccountId(), vmId, vmName,
soId, templateId, hypervisorType, event.getCreateDate(), null);
m_usageInstanceDao.persist(usageInstanceNew);
populateDynamicComputeOfferingDetailsAndPersist(usageInstanceNew, event.getId());
}
}
private void populateDynamicComputeOfferingDetailsAndPersist(UsageVMInstanceVO usageInstance, Long eventId) {
//populate the cpu, memory and cpuSpeed of the vm when created from a dynamic offering.
UsageEventDetailsVO cpuNumber = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuNumber.name());
if (cpuNumber != null) {
usageInstance.setCpuCores(Long.parseLong(cpuNumber.getValue()));
}
UsageEventDetailsVO cpuSpeed = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuSpeed.name());
if (cpuSpeed != null) {
usageInstance.setCpuSpeed(Long.parseLong(cpuSpeed.getValue()));
}
UsageEventDetailsVO memory = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.memory.name());
if (memory != null) {
usageInstance.setMemory(Long.parseLong(memory.getValue()));
}
m_usageInstanceDao.persist(usageInstance);
}
private void createNetworkHelperEntry(UserStatisticsVO userStat, UsageNetworkVO usageNetworkStats, long timestamp) {
long currentAccountedBytesSent = 0L;
long currentAccountedBytesReceived = 0L;