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

make signature calculation consistent across management servers

This commit is contained in:
Chiradeep Vittal 2011-08-30 14:54:30 -07:00
parent 37b4384990
commit 82fcfe8edc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@
*/
package com.cloud.agent.api;
import org.apache.commons.codec.digest.DigestUtils;
import com.cloud.agent.api.LogLevel.Log4jLevel;
@ -84,6 +86,10 @@ public class SecurityIngressRulesCmd extends Command {
this.signature = signature;
this.seqNum = seqNum;
this.vmId = vmId;
if (signature == null) {
String stringified = stringifyRules();
this.signature = DigestUtils.md5Hex(stringified);
}
}

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

@ -88,6 +88,7 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
}
Set<Long> workItems = new TreeSet<Long>();
workItems.addAll(affectedVms);
if (s_logger.isTraceEnabled()) {
s_logger.trace("Security Group Mgr v2: scheduling ruleset updates for " + affectedVms.size() + " vms " + " (unique=" + workItems.size() + "), current queue size=" + _workQueue.size());
}
@ -158,11 +159,11 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
Long agentId = vm.getHostId();
if (agentId != null) {
SecurityIngressRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(),
vm.getPrivateMacAddress(), vm.getId(), generateRulesetSignature(rules),
vm.getPrivateMacAddress(), vm.getId(), null,
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());
": num rules=" + cmd.getRuleSet().length + " num cidrs=" + cmd.getTotalNumCidrs() + " sig=" + cmd.getSignature());
}
Commands cmds = new Commands(cmd);
try {