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

321 Commits

Author SHA1 Message Date
anthony 4423da06a2 1. added timeout in Command Class, then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute 
2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null),
 2011-09-07 19:17:54 -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
frank 7350d12fff Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use cluster name as OCFS2 cluster name
 2011-08-19 17:06:35 -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
Edison Su eada883b5e bug 11183: put volume state into "Creating" state if it's created from snapshot. 
status 11183: resolved fixed
 2011-08-19 13:46:51 -07:00
Edison Su 8bbed3caea bug 11183: put volume state into "Creating" state if it's created from snapshot. 
status 11183: resolved fixed
 2011-08-19 13:45:35 -07:00
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su 48342ff6e2 remove unnecessary transcation 2011-08-16 10:30:52 -07:00
Kelven Yang eb28549e6c Seperate template cleanup control to enable template preloading 2011-08-09 13:42:50 -07:00
Kelven Yang fe9ccf33b5 Seperate template cleanup control to enable template preloading 2011-08-09 13:38:27 -07:00
anthony 455f9f642c bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:31:14 -07:00
anthony 1a070f4c1b bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:28:34 -07:00
frank 7e1fc2ca1a Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use cluster name as OCFS2 cluster name
 2011-08-08 18:22:43 -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
frank c6fba0fd42 Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- prepare OCFS2 nodes
 2011-08-05 17:46:29 -07:00
anthony e666cf5e77 bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support 2011-07-21 17:31:43 -07:00
Alex Huang 109ef29e86 bug 10632: propagate to 2.2.9 2011-07-20 16:27:06 -07:00
kishan 6b4c61a348 bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-20 11:22:31 +05:30
kishan ddd416a492 bug 10382: wrapped usage events in txn 2011-07-20 11:19:39 +05:30
kishan 427b73a2b9 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-20 11:13:56 +05:30
alena c48c3edfbc bug 10271: don't include removed records when search for local storage pool 
status 10217: resolved fixed
 2011-07-19 11:10:53 -07:00
Alex Huang 392c03ce6f propagated db connection savings from master 2011-07-18 14:22:49 -07:00
alena 3b3a99ce43 bug 10727: fixed duplicated usage event generation when create volume from snapshot 
status 10727: resolved fixed

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
 2011-07-14 10:34:55 -07:00
alena d11ac32f08 bug 10727: fixed duplicated usage event generation when create volume from snapshot 
status 10727: resolved fixed
 2011-07-14 10:28:28 -07:00
alena 1979d1d065 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2011-07-13 18:25:13 -07:00
alena 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed
 2011-07-13 17:16:07 -07:00
Alex Huang ea48d40e5f connection conierge to deal with connections that are not returned to pools 2011-07-08 18:04:57 -07:00
Alex Huang c679fc078a bug 10632: allow volume to be recreated when it is in recreating state 2011-07-08 18:04:57 -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
Edison Su 902f8172e3 bug 10293: don't destroy volume if it's not created 
status 10293: resolved fixed
 2011-07-08 13:19:32 -07:00
anthony fc5c657980 bug 10608: 
only one primary storage in a cluster can be in PrepareMaintenance mode
 2011-07-07 19:43:43 -07:00
anthony f2117197f5 bug 10608: 
only one primary storage in a cluster can be in PrepareMaintenance mode
 2011-07-07 19:40:04 -07:00
anthony 01a04935aa bug 10611: MS puts primary storage into cancelmaintenace mode, then try to start VMs which were running on top of it, but failed because primary storage is in cancelmaintenace mode 
fixed

status 10611: resolved fixed
 2011-07-07 16:21:23 -07:00
anthony a7f8b66813 bug 10611: MS puts primary storage into cancelmaintenace mode, then try to start VMs which were running on top of it, but failed because primary storage is in cancelmaintenace mode 
fixed

status 10611: resolved fixed
 2011-07-07 16:20:25 -07:00
anthony 47296e64ac bug 10587: correctly use transaction 
status 10587: resolved fixed

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
 2011-07-06 18:57:36 -07:00
anthony 4040b39fe1 bug 10587: correctly use transaction 
status 10587: resolved fixed
 2011-07-06 18:55:15 -07:00
kishan 561f415d5a bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-06 18:08:48 +05:30
kishan fd6900a3d8 bug 10382: wrapped usage events in txn 2011-07-01 18:11:56 +05:30
kishan 36d7ee5634 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-01 16:37:53 +05:30
anthony b6eafd7102 bug 10512: lock on snapshot entry instead of volume entry 
status 10512: resolved fixed
 2011-06-29 18:54:53 -07:00
anthony 253ae79876 bug 10512: lock on snapshot entry instead of volume entry 
status 10512: resolved fixed
 2011-06-29 18:53:41 -07:00
anthony ed614c4f52 bug 10511: lock on snapshot entry instead of volume entry 
status  10511: resolved fixed
 2011-06-29 18:41:55 -07:00
anthony 43de3ec249 bug 10511: lock on snapshot entry instead of volume entry 
status  10511: resolved fixed
 2011-06-29 18:40:18 -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 7d060d3388 list template will list ready template if there is, if not, list in progress, if not list other 2011-06-28 19:18:10 -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 260e4dbb51 list template will list ready template if there is, if not, list in progress, if not list other 2011-06-28 19:03:46 -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