etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,912 Commits 328 Branches 325 Tags 892 MiB
Commit Graph

209 Commits

Author SHA1 Message Date
kishan 507bc20c03 bug 11938: Removed unique constraint on usage_network_offering table. 
status 11938: resolved fixed
reviewed-by: Abhi
 2011-11-09 16:28:22 +05:30
kishan b40742fdae 30 premium upgrade should extend regular upgrade 2011-11-01 18:51:04 +05:30
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
kishan 284ee3909e bug 9842: Added task to update user stats agg bytes in sync with aggregation range 
status 9842: resolved fixed
 2011-10-31 17:15:36 +05:30
kishan 83b4d2f7f9 bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values. 2011-10-24 10:26:02 +05:30
alena eba6864965 bug 11667: drop primary keys in cloud_usage.usage_load_balancer_policy and cloud_usage.usage_port_forwarding 
status 11667: resolved fixed

Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
 2011-10-07 11:02:14 -07:00
alena d399c901c8 bug 11666: fixed foreign key upgrade in networks table 
status 11666: resolved fixed
 2011-10-06 18:15:57 -07:00
alena 53b1b9f63b bug 11603: for OSS build - update guru_name from GuestNetworkGuru to ExternalGuestNetworkGuru. 
status 11603: resolved fixed
 2011-09-29 10:43:01 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature: 
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
 2011-09-20 18:35:28 -07:00
kishan d2293137c7 bug 11199: Moved DB upgrade changes to schema-2211to2212-premium 
status 11199: resolved fixed
 2011-09-13 23:28:54 +05:30
alena f6a79c603f bug 11036: resource count update is refactored 
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
 2011-09-13 10:47:36 -07:00
kishan 8d5e7ff659 bug 11316: In 2.2.y, removed new template upgrade changes. Added upgrade path from 2210 to 2211. Moved existing changes to 2211to2212 
status 11316: resolved fixed
 2011-08-31 15:16:12 +05:30
kishan 2ff1e4f92a bug 11316: Removed new template upgrade changes. Added upgrade path from 2210 to 2211. Existing changes moved to 2211to2212 upgrade 
status 1316: resolved fixed
 2011-08-31 14:19:20 +05:30
Edison Su 03e33f16bf bug 11217: only work on the snapshot whose state is "backedup" and is not removed 
status 11217: resolved fixed
 2011-08-29 15:28:01 -07:00
Edison Su 60cbef1fb8 bug 11217: add db upgrade script, if sechost_id is missing of a snapshot, add one got from presnapshot_id 
status 11217: resovled fixed

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
 2011-08-29 15:27:53 -07:00
prachi b6851e631e Bug 9921 - template tags 
-Upgrade path from 2.2.10 to 2.2.11
 2011-08-25 12:09:21 -07:00
prachi 05440f0905 Bug 9921 - template tags 
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
 2011-08-25 12:03:59 -07:00
frank b3478c377e Full opensource 2011-08-23 19:52:19 -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
alena 6f436b6b0b Improved logging in 229 to 2210 upgrade 2011-08-15 10:21:20 -07:00
alena 73fe2cbb89 Fixed db upgrade issue for 229-2210 firewall rules 2011-08-15 10:20:34 -07:00
alena 803255b0ba bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now 
status 11029: resolved fixed

Commit also includes the following:

* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule
 2011-08-15 10:18:09 -07:00
keshav 8dd86ff803 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 18:19:52 -07:00
keshav 57f1ee7ca1 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 16:06:32 -07:00
alena 354bc8f684 Fixed upgrade for volumes table 2011-08-04 11:22:14 -07:00
alena 4abb737c04 Fixed upgrade for volumes table 2011-08-04 11:22:04 -07:00
alena 603de56c93 Merged fixes for 228-229 upgrade from 2.2.8 zucchini branch 2011-08-03 10:39:02 -07:00
alena da4b39279d Added 229 to 2210 upgrade path 
Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	setup/db/db/schema-228to229.sql
 2011-08-03 10:23:27 -07:00
alena cf7e351cbf bug 10921: remove obsolete keys during 2.1.x to 2.2.9 upgrade 
status 10921: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
 2011-08-03 10:15:09 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
alena 95d858d1f2 bug 10927: Drop key i_snapshots__removed (if exists) and readd it. Done to fix inconsistency between 2.1.x to 2.2.9 and 2.2.x to 2.2.9 upgrades 2011-08-01 16:22:06 -07:00
alena d63426119e Fixed db upgrade to do 228 to 229 when do upgrade from 224 branch 
Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
 2011-08-01 15:48:42 -07:00
alena a0977ee61f Fixed db upgrade to do 228 to 229 when do upgrade from 224 branch 2011-08-01 15:44:42 -07:00
alena d30fe74794 Added 229 to 2210 upgrade path 2011-08-01 15:42:16 -07:00
frank 50b665d713 Add DB integrity checker, it checks: 
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
 2011-07-30 17:22:09 -07:00
frank ca78e49cbd Add DB integrity checker, it checks: 
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
 2011-07-30 17:21:50 -07:00
frank 6c1cd20fff Add DB integrity checker, it checks: 
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
 2011-07-30 17:16:33 -07:00
frank 03fbe13f58 Add upgrade path to 2.2.9 
Add files
 2011-07-29 20:05:50 -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
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
alena 8b100f7c4d bug 10409: added domainSuffix parameters to account/domain objects 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-228to229.sql
 2011-07-19 11:10:52 -07:00
alena 9c7aade3d1 bug 10733: fixed/added incorrect/missing keys in 228 to 229 upgrade 
status 10733: resolved fixed

Conflicts:

	setup/db/db/schema-228to229.sql
 2011-07-15 15:10:11 -07:00
alena f67c771410 bug 10733: fixed/added incorrect/missing keys in 228 to 229 upgrade 
status 10733: resolved fixed
 2011-07-15 15:07:11 -07:00
alena 0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
alena 506ca6cff3 bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start. 
status 10686: resolved fixed

Also updated 227 to 228 db upgrade to insert missing usage_event records

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-11 16:13:22 -07:00
alena cc9a629cea bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start. 
status 10686: resolved fixed

Also updated 227 to 228 db upgrade to insert missing usage_event records
 2011-07-11 16:11:05 -07:00
alena 62a570484c fix db upgrade from 2.2.6 to 2.2.8 
Conflicts:

	setup/db/db/schema-227to228.sql
 2011-07-08 09:51:50 -07:00
alena 27ef3a1d2d bug 10651: added missing keys to 227 to 228 db upgrade 
status 10651: resolved fixed

Conflicts:

	setup/db/db/schema-227to228.sql
 2011-07-08 09:49:19 -07:00