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

useful logging

This commit is contained in:
Chiradeep Vittal 2011-08-26 12:10:29 -07:00
parent 35f44615e0
commit d6448d9fb8
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java
View File

@ -143,5 +143,14 @@ public class SecurityIngressRulesCmd extends Command {
public Long getVmId() {
return vmId;
}
public int getTotalNumCidrs() {
//useful for logging
int count = 0;
for (IpPortAndProto i: ruleSet) {
count += i.allowedCidrs.length;
}
return count;
}
}

14
server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
View File

@ -79,7 +79,7 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
return;
}
if (s_logger.isTraceEnabled()) {
s_logger.trace("Security Group Mgr2: scheduling ruleset updates for " + affectedVms.size() + " vms");
s_logger.trace("Security Group Mgr v2: scheduling ruleset updates for " + affectedVms.size() + " vms, current queue size=" + _workQueue.size());
}
Set<Long> workItems = new TreeSet<Long>();
workItems.addAll(affectedVms);
@ -88,7 +88,10 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
txn.start();
_rulesetLogDao.createOrUpdate(workItems);
txn.commit();
_workQueue.submitWorkForVms(workItems);
int newJobs = _workQueue.submitWorkForVms(workItems);
if (s_logger.isTraceEnabled()){
s_logger.trace("Security Group Mgr v2: done scheduling ruleset updates: num new jobs=" + newJobs);
}
}
@ -142,9 +145,16 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
SecurityIngressRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(),
vm.getPrivateMacAddress(), vm.getId(), generateRulesetSignature(rules),
work.getLogsequenceNumber(), rules);
if (s_logger.isTraceEnabled()) {
s_logger.trace("SecurityGroupManager v2: sending ruleset update for vm " + vm.getInstanceName() +
": num rules=" + cmd.getRuleSet().length + " num cidrs=" + cmd.getTotalNumCidrs());
}
Commands cmds = new Commands(cmd);
try {
_agentMgr.send(agentId, cmds, _answerListener);
if (s_logger.isTraceEnabled()) {
s_logger.trace("SecurityGroupManager v2: sent ruleset updates for " + vm.getInstanceName() + " curr queue size=" + _workQueue.size());
}
} catch (AgentUnavailableException e) {
s_logger.debug("Unable to send updates for vm: " + userVmId + "(agentid=" + agentId + ")");
}

3
server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
View File

@ -74,7 +74,8 @@ public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> im
if (s_logger.isTraceEnabled())
s_logger.trace("Updated or inserted " + workItems.size() + " log items");
} catch (SQLException e) {
s_logger.warn("Failed to execute batch update statement for ruleset log");
s_logger.warn("Failed to execute batch update statement for ruleset log: ", e);
txn.rollback();
success = false;
}
if (!success && queryResult != null) {