318 Commits

Author SHA1 Message Date
alena
b5b695b82a bug 11262: validate public key before processing it
status 11262: resolved fixed
2011-08-29 11:07:01 -07:00
alena
9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
alena
8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
Alex Huang
009e60266d fix for the problem of locking connection being gone 2011-08-22 10:08:22 -07:00
Alex Huang
40dac77872 fix for the problem of locking connection being gone 2011-08-22 10:05:37 -07:00
frank
18f87c2108 Merge branch 'cvm' into 2.2.y
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
Alex Huang
6e7ad8830f bug 11043: Propagating fix 2011-08-11 10:30:03 -07:00
Alex Huang
15f86d3d93 bug 11043: rverted the bad fix 2011-08-11 10:25:31 -07:00
alena
6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
Alex Huang
a0ea38eb24 Added a method to tell if the inaccurate clock is keeping up with the current time 2011-08-09 10:53:12 -07:00
Alex Huang
5fc13a63b1 There's no background thread working on maintaining the connections 2011-08-09 10:51:13 -07:00
alena
06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -07:00
frank
6aaf3d5ae0 Merge branch 'cvm'
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
Kelven Yang
e4a1d491c1 bug 10976: NPE fix to avoid blocking shutdown process 2011-08-05 14:10:15 -07:00
Kelven Yang
9f94a178d6 bug 10976: NPE fix to avoid blocking shutdown process 2011-08-05 14:06:48 -07:00
anthony
37dcec77bb Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-08-02 17:31:36 -07:00
anthony
dc7ff2b5ad Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
2011-08-02 16:52:24 -07:00
Alex Huang
f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
frank
316ed91542 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)
run checker before any component loaded
2011-07-29 20:22:39 -07:00
frank
67265eeaa7 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)
run checker before any component loaded
2011-07-29 20:21:53 -07:00
frank
44f3ac98f6 A couple of things:
add 229 upgrade path

Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)

run checker before any components loaded
2011-07-29 20:05:50 -07:00
Alex Huang
1f4d34b9d5 print further into the stack so we can see who's calling the Transaction methods 2011-07-29 10:51:16 -07:00
frank
9aae53fbb3 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:43:38 -07:00
frank
262e6784e5 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
frank
1381c58fa1 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
Sheng Yang
b116f54741 Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:23:44 -07:00
Sheng Yang
4d20d21c95 Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:23:06 -07:00
Sheng Yang
611a1564cc Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:22:30 -07:00
Alex Huang
b30c55a53f missing file 2011-07-25 18:07:17 -07:00
Alex Huang
9c627a15f3 Inaccurate clock new gets an mbean to control it 2011-07-25 16:01:31 -07:00
Alex Huang
10ac7753ed Switched ping to use the same db connection so that running out of db connections won't affect basic operations 2011-07-25 10:36:00 -07:00
Alex Huang
ec4a46ece3 use in memory counter for locks so we don't do a delete everytime 2011-07-23 15:24:33 -07:00
Alex Huang
69d928b3d1 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 15:03:09 -07:00
Alex Huang
0df4c628a8 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 15:02:33 -07:00
Alex Huang
3f18192df8 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 14:58:32 -07:00
Alex Huang
b59c6b4ab6 propagate lock table fix 2011-07-22 11:35:47 -07:00
Alex Huang
44ce9488a6 propagate lock table fixes 2011-07-22 11:30:23 -07:00
Alex Huang
66713a490d fixed problem with the standalone connection has open transaction 2011-07-22 11:25:43 -07:00
Sheng Yang
15bf729927 bug 10714: Implement packet fragmentation
Also add an simple nio unit test.

status 10714: resolved fixed
2011-07-22 10:08:40 -07:00
alena
be3683306e bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:49:08 -07:00
alena
e344d5f63a bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:48:48 -07:00
alena
39ad35af2c bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:30:09 -07:00
Alex Huang
f500a01511 more db connection controls through jmx 2011-07-21 13:38:53 -07:00
Alex Huang
d7667180c5 bug 10816: more db lock controls 2011-07-21 13:38:37 -07:00
Alex Huang
5cfad0b6c9 connection conierge to deal with connections that are not returned to pools 2011-07-21 13:32:43 -07:00
Alex Huang
3ea6948645 bug 10716: Changed transaction level to read committed to allow for more concurrency 2011-07-20 15:54:51 -07:00
Alex Huang
950b53eea9 more db connection controls through jmx 2011-07-19 09:27:09 -07:00
Alex Huang
6a27d11434 more db connection controls through jmx 2011-07-19 09:26:05 -07:00
Alex Huang
d54f6d536a propagating transaction isolation fix for merovingian2 2011-07-18 16:48:49 -07:00
Alex Huang
5590cd93ce bug 10716: Changed the connection's isolation level to allow for more concurrency 2011-07-18 16:32:12 -07:00