Commit Graph

61 Commits

Author SHA1 Message Date
Alena Prokharchyk 6b9abf832b bug 13944: when delete the account, expunge detached volumes on the backend
status 13944: resolved fixed
Reviewed-by: Frank Zhang
2012-02-22 17:59:22 -08:00
anthony 86aef08865 cleanup snapshot in secondary storage in background
Conflicts:

	core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
2012-01-19 20:44:44 -08:00
Abhinandan Prateek 5b9527ccd1 bug 12965: donot send command to pool if no host is up and enabled. (This condition needs to be reviewed, Nitin will initiate a disucssion and file a separate bug for it) 2012-01-10 15:34:38 +05:30
Nitin 6423631522 bug 10893: Adding a new capacity type - Local Primary storage. 2011-10-27 11:22:18 +05:30
Nitin 1177d5e779 bug 10848: ListCapacity - Adding the real time usage stuff as well. 2011-10-27 11:19:21 +05:30
Edison Su 3f7ce01f28 bug 10803: using updatehost api to change secondary storage url, the url need to be nfs://host/path format
status 10803: resolved fixed
2011-10-26 16:27:28 -07:00
frank 1460f3950e Bug 9949 - revert VM to template
1. able to restore VM from its original template
2. Only allow to restore when VM is running or stopped
3. after restoring, VM state will not change, e.g. running is still running

status 9949: resolved fixed
2011-10-25 13:52:39 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -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 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su a24eef5c81 add new option to force destroy vm when delete host, if the VMs are created on local storage 2011-07-08 13:49:05 -07:00
anthony 2fb5de8852 fixed several template issues
merge createtemplateresponse and createteisoresponse

on UI template
only show template corresponding hypervisor exists

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/storage/StorageManager.java
2011-06-29 18:31:13 -07:00
anthony 446d08187b fixed several template issues
merge createtemplateresponse and createteisoresponse

on UI template
only show template corresponding hypervisor exists
2011-06-29 15:56:01 -07:00
anthony cf83700bf4 fixed buld 2011-06-29 10:56:48 -07:00
anthony d902d313b7 fixed a template creation bug
Conflicts:

	server/src/com/cloud/storage/StorageManager.java
2011-06-28 19:17:34 -07:00
anthony f85fb432ba fixed a template creation bug 2011-06-28 17:55:21 -07:00
Edison Su 28f0068151 add new option to force destroy vm when delete host, if the VMs are created on local storage 2011-06-23 20:36:13 -04:00
Edison Su 36fa0fbf52 bug 10177: fix multiple local secondary storage: when we starting vm, only choose the local secondary storage that related to the planned computing host
status 10177: resolved, fixed
2011-06-08 11:14:59 -04:00
Edison Su 00268632ac bug 10177: fix multiple local secondary storage: when we starting vm, only choose the local secondary storage that related to the planned computing host
status 10177: resolved, fixed
2011-06-07 20:22:16 -04:00
anthony d02e4fb37f bug 10100 : if there are more than one hypervisor type in one zone, create_template_from_snapshot may be sent to host with diferent hypervisor type
status 10100 : resolved fixed
2011-06-01 15:30:22 -07:00
Edison Su 59a6e2157a fix user data, and template sync 2011-05-27 19:44:26 -04:00
anthony 99be3718cf bug 3224:
multiple secondary storage, copying template between zone works
2011-05-19 19:07:44 -07:00
Chiradeep Vittal 303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang 6ce656220f bug 9643: propagate fix from 2.2.4 2011-04-29 17:51:42 -07:00
Alex Huang 9909371eaa bug 9445: Signal alert for the host if a primary storage pool was unavailable on that host 2011-04-26 15:09:36 -07:00
anthony 86f32e4735 bug 9455: when host is disconnected, also remove entry in storage_pool_host_ref
status 9455: resolved fixed
2011-04-14 14:31:16 -07:00
Frank 92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
anthony 436dccb6d7 bug 9189: fixed it in master, modifystoragepool doesn't try to create/import any more, will port it to 2.1.x 2011-03-28 19:11:20 -07:00
Alex Huang 9d158dc060 Removed the async create status for volume now that our customers don't use it 2011-03-24 20:04:23 -07:00
nit f88fb1e505 bug 8887 : Stats Calculation Improvement - Storage stats wont update DB anymore and would be kept "in memory" just like other stats. For the listCapacityCmd which consumes it (sec. storage used and primary storage used) this would be constructed using the in memory maps rather than DB which wont have sec storage and primary storage used in the DB anymore. 2011-03-14 18:45:00 -07:00
prachi 889827b63a Bug 7845 - Productize DeploymentPlanner
Bug 7723 - merge or re-write host tagging into master / 2.2
Bug 7627 - Need more logging for Allocators
Bug 8317 - Add better resource allocation failure messages

Changes for Deployment Planner to use host and storagePool allocators to find deployment destination.
Also has the changes for host tag feature.
Improved the logging for allocators.
2011-02-28 13:47:51 -08:00
anthony 94a9c86f46 try to send create command to the host where cpu&memory is allocated first 2011-02-22 16:44:58 -08:00
Alex Huang 60518dc226 storage rewrite 2011-01-28 15:37:00 -08:00
Alex Huang 3a9d6884ce Removed useless code 2011-01-20 09:54:05 -08:00
Alex Huang 42950f2e8b migration complete 2011-01-14 15:12:13 -08:00
Alex Huang 6e6e8ff876 better expunge and destroy of volumes 2011-01-11 18:02:09 -08:00
anthony f865e8b061 moveVolume is broken due to not setup hypervisortype in dskch
fixed
2010-12-28 19:46:21 -08:00
abhishek 6b1e4d92ef made some changes to the vm expunge flow, also added a state transition to error for vm if creation fails 2010-12-21 12:48:13 -08:00
abhishek 6eacec782e bug 7528: the vm expunge action wasn't destroying the volumes during vm destroy. Added logic to do that. Also, made sure the volumes are removed during vm expunge
status 7528: resolved fixed
2010-12-20 14:56:32 -08:00
Alex Huang 1e44925564 api refactoring 2010-11-21 12:00:21 -08:00
anthony 2537dc3058 bug 7149: merge from 2.1.x 2010-11-12 13:16:03 -08:00
abhishek baa28d2022 returning serverapiexceptions for prepare and cancel pool maintenance; making it consistent with other pieces of code 2010-11-04 13:40:10 -07:00
Alex Huang e27bb550fe Harmony among gurus 2010-11-03 21:18:31 -07:00
alena 52a8370102 bug 6955: return embedded object for PreparePrimaryStorageForMaintenance
status 6955: resolved fixed
2010-11-03 14:30:35 -07:00
Alex Huang 3279c26796 Removed a bunch of InternalErrorException 2010-11-02 12:25:08 -07:00
Kris McQueen 365ac7501f bug 6672: Fix up volume commands. For createVolume, the command is supposed to create a database object, but not assign it to a storage pool until the user first attaches it to a vm instance. That allows the volume to start off hypervisor agnostic. For attachVolume, detachVolume, and listVolumes, the responses had minor issues (sourceType could be null, for example) in either the response generation, or the response handling by the UI.
status 6672: resolved fixed
2010-10-21 15:15:01 -07:00
Alex Huang 794ca16a65 Added code to start domR 2010-10-19 11:52:01 -07:00
Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master 2010-10-12 16:28:16 -07:00
Kris McQueen 2740ba6c40 final merge of master->2.1.refactor preparing for merge back into master 2010-10-12 14:46:24 -07:00
Alex Huang ce091de3d2 more changes for refactor 2010-10-12 07:17:47 -07:00