mirror of https://github.com/apache/cloudstack.git
551e11cf3e
This ports PR #1470 by @remibergsma. Make the generated json files unique to prevent concurrency issues: The json files now have UUIDs to prevent them from getting overwritten before they've been executed. Prevents config to be pushed to the wrong router. 2016-02-25 18:32:23,797 DEBUG [c.c.a.t.Request] (AgentManager-Handler-1:null) (logid:) Seq 2-4684025087442026584: Processing: { Ans: , MgmtId: 90520732674657, via: 2, Ver: v1, Flags: 10, [{"com.cloud.agent.api.routing.GroupA nswer":{"results":["null - success: null","null - success: [INFO] update_config.py :: Processing incoming file => vm_dhcp_entry.json.4ea45061-2efb-4467-8eaa-db3d77fb0a7b\n[INFO] Processing JSON file vm_dhcp_entry.json.4ea4506 1-2efb-4467-8eaa-db3d77fb0a7b\n"],"result":true,"wait":0}}] } On the router: 2016-02-25 18:32:23,416 merge.py __moveFile:298 Processed file written to /var/cache/cloud/processed/vm_dhcp_entry.json.4ea45061-2efb-4467-8eaa-db3d77fb0a7b.gz Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> |
||
|---|---|---|
| .. | ||
| cs | ||
| setup | ||
| baremetal-vr.py | ||
| baremetal_snat.sh | ||
| bumpup_priority.sh | ||
| checkbatchs2svpn.sh | ||
| checkrouter.sh | ||
| checks2svpn.sh | ||
| cloud-nic.sh | ||
| configure.py | ||
| cs_cmdline.py | ||
| cs_dhcp.py | ||
| cs_firewallrules.py | ||
| cs_forwardingrules.py | ||
| cs_guestnetwork.py | ||
| cs_ip.py | ||
| cs_loadbalancer.py | ||
| cs_monitorservice.py | ||
| cs_network_acl.py | ||
| cs_remoteaccessvpn.py | ||
| cs_site2sitevpn.py | ||
| cs_staticroutes.py | ||
| cs_vmdata.py | ||
| cs_vmp.py | ||
| cs_vpnusers.py | ||
| dnsmasq.sh | ||
| edithosts.sh | ||
| getRouterAlerts.sh | ||
| get_template_version.sh | ||
| ilb.sh | ||
| ipassoc.sh | ||
| ipsectunnel.sh | ||
| line_edit.py | ||
| loadbalancer.sh | ||
| master.py | ||
| merge.py | ||
| monitor_service.sh | ||
| netusage.sh | ||
| passwd_server | ||
| passwd_server_ip | ||
| passwd_server_ip.py | ||
| prepare_pxe.sh | ||
| savepassword.sh | ||
| set_redundant.py | ||
| update_config.py | ||
| vmdata.py | ||
| vpc_func.sh | ||
| vpc_netusage.sh | ||
| vpc_passwd_server | ||
| vpc_snat.sh | ||
| vpc_staticroute.sh | ||
| vr_cfg.sh | ||