Commit Graph

885 Commits

Author SHA1 Message Date
frank 0f5384d086 Bug 11522 - New agent manager
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
prachi a51fb221d6 Bug 11169 - Couldn't deploy a router because the host it existed on is in Maintenance.
Changes:
- VirtualMachineMgr puts the constraint that if Root volume is already READY, we provide the clusterId in the plan to the deploymentPlanner. Planner then searches for resources only under that cluster.
- If no deployment could be found, deploying VM fails.
- Fixed this, such that incase the root volume is recreatable, we call the planner again by removing the cluster constraint. Planner will then search for resources in other clusters.
- Works for system VMs(SSVM, consoleproxy, virual routers).
2011-10-05 18:35:59 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
prachi 9bd5e5871b Bug 11481 - get manual live migration working with all VMs
Changes:
- Added a new API  'migrateSystemVm'  backed by MigrateSystemVMCmd.java to migrate system VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
- This is Admin only action
- The existing API 'migratevirtualmachine' is only for user VMs
2011-09-29 17:47:46 -07:00
alena 12e25fb988 Implemented vm* api commands to be executed against the project 2011-09-29 10:20:51 -07:00
Abhinandan Prateek 83c6cf3db0 bug 10588: code to sync VM state at cluster level and dettached from ping command 2011-09-27 13:18:21 +05:30
alena ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
alena a1cab92ae1 bug 11537: revoke related FirewallRules when do vmExpunge and ipAddress release.
status 11537: resolved fixed

Reviewed-by: edison@cloud.com

Conflicts:

	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-09-22 14:01:02 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account
2) Added "Project" limit type for the Domain object
2011-09-21 17:09:49 -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
prachi 0eea1cb733 Bug 11404 - VM was in Running state, had null for a pod_id, basically didnt allow creation of subsequent vm's
Reviewed-by: Alex

Changes:
- When management server starts, it goes through all the pending work items from op_it_work table and schedules HA work for each. It used to mark each item as done. Instead we should keep the item as pending and let it get marked as Done after the HA work is done.
- Changes in VirtualMachineMgr::advanceStop() :
a) if we find a VM with null hostId, we stop the VM only if it is forced stopped.
b) if VM state transition to Stopping fails,for state Starting and Migrating we try to find the pending work item and then do cleanup the VM. In case state is Stopping we can cleanup directly.
c) We proceed releasing all resources only if state transitioned to 'Stopping'.
- Changes in HA:
a) Depend on VirtualMachineMgr::advanceStop() in case host is not found to do VM cleanup
- When Vm state between mgmt server and agent syncs from starting -> running, mark any pending work item as done.

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-09-15 19:06:19 -07:00
prachi 6b82ba3ff9 Bug 11457 - NullPointerException while synching VM state from Starting -> Running between management server and agent
Reviewed-by: Kelven and Alex

Changes:
- Added log statements about the podId during deploying a VM.
2011-09-15 16:16:24 -07:00
prachi df17ce5648 Bug 11457 - NullPointerException while synching VM state from Starting -> Running between management server and agent
reviewed-by: Alex/Kelven

Changes:
1.	UserVmManagerImpl :: finalizeStart()
Added null check for the cmds.getAnswers() object. Return ‘true’ if null.

2.	VirtualMachineManagerImpl :: advanceStart()
Move the line to set PodId to the vm being started above the state transition where hostId gets set, so that podId is not null in case management server goes down when vm starts on the agent. On restart, podId is not updated during fullsync. So this will prevent podId remaining null.

vm.setPodId(dest.getPod().getId());
2011-09-15 16:16:15 -07:00
Kelven Yang 7a64d8fda4 add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation 2011-09-14 15:15:26 -07:00
alena b7f45cfbd6 bug 11434: don't execute destroy call when vm is already in Destroyed/Expunging state
status 11434: resolved fixed
2011-09-14 10:33:45 -07:00
Chiradeep Vittal cfbbe4c031 fix perf. issue in deploy vm. also remove dead code in dao 2011-09-12 18:20:23 -07:00
Kelven Yang 41926cb038 bug 11377: remove the restriction on VMware in API layer to let it support VM manual migration 2011-09-12 14:28:32 -07:00
prachi d854923ac5 Bug 11200 - maximum number of guests per host
Manual Migration should fail if the destination host chosen by Admin already has max guest VMs running.
2011-09-08 18:33:55 -07:00
prachi 4ad9ac5e71 Bug 11200 - maximum number of guests per host
Changes:

To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:

- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there.
2011-09-08 18:08:31 -07:00
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
Kelven Yang 905df61aac bug 11362: Make VM network adapter device type be selectable based on VM-specific details 2011-09-07 17:58:42 -07:00
prachi 84868b7f9c Bug 11200 - maximum number of guests per host
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
2011-09-07 14:53:05 -07:00
kishan f9d5a46871 Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug 2011-09-05 18:41:42 +05:30
alena b93318cb73 bug 11002: userVmDao - create searchBuilder as a part of dao init process (otherwise it's not threadsafe)
status 11002: resolved fixed
2011-09-02 15:51:52 -07:00
alena ecd99ad379 bug 11332: don't try to log vm's information when the vm is already Expunged
status 11332: resolved fixed

Conflicts:

	server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
2011-09-02 12:08:39 -07:00
Kelven Yang ebfe43d15c bug 11263: only update host Id when VM is in running state when detected external VM migration 2011-08-26 16:28:58 -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
Abhinandan Prateek cd01f7dab2 bug 11181: taking care of a boundary condition with 0 user VM 2011-08-25 15:38:48 +05:30
alena ee9fbf10b6 Method signature change 2011-08-24 14:56:37 -07:00
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions.
status 11236: resolved fixed
2011-08-24 14:48:35 -07:00
root 01044c5b2d removing spurious debug statement 2011-08-24 16:47:29 +05:30
Abhinandan Prateek bd439831ad bug 11181: batching the select statements 2011-08-24 16:34:28 +05:30
alena d3eb9db7fa bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
status 11204: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
prachi 40d348ff8b Bug 11213 - UserConcentratedPod returning wrong list of pods
Changes:
- Needed to add parentheses to the query to get correct results.
2011-08-23 11:53:48 -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 b607e4aa1c Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y 2011-08-19 17:29:57 -07:00
Edison Su 7a7662b01b fix typo 2011-08-19 16:15:52 -07:00
Edison Su eb72d340e2 fix typo 2011-08-19 16:15:17 -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 56244c7c47 release the check 2011-08-19 16:07:55 -07:00
Edison Su de25a63ba8 release the check 2011-08-19 16:06:13 -07:00
Edison Su 5696543359 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:27:13 -07:00
Edison Su 1c49481305 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:26:47 -07:00
Abhinandan Prateek 8d4c7208a4 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:23:49 +05:30
Abhinandan Prateek 601708c3e6 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:21:03 +05:30
Sheng Yang 843e41752f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:23 -07:00
Sheng Yang a961dd913f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:13 -07:00
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su ea102aa045 add host guid in migrate command 2011-08-18 11:03:40 -07:00
frank 035001bd19 Fix baremetal planner reply to non-baremetal VM when migration 2011-08-18 10:14:40 -07:00
frank 523a32edaa Fix baremetal planner reply to non-baremetal VM when migration 2011-08-18 10:14:16 -07:00
Abhinandan Prateek c2a769d993 fixed execptions while adding second host 2011-08-18 16:28:19 +05:30
Abhinandan Prateek 2df6e5cc69 fixed execptions while adding second host 2011-08-18 16:26:00 +05:30
alena 441d9d765c bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:04:11 -07:00
alena 6291554576 bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:03:53 -07:00
Kelven Yang a9c67d23fa bug 11099: Let VM sync to cooperate with migration process 2011-08-16 15:23:01 -07:00
Edison Su ed7214c710 add host guid in migrate command 2011-08-16 10:30:52 -07:00
alena 356728ae19 Fixed spelling mistake 2011-08-16 09:52:00 -07:00
Kelven Yang bbf20ac125 bug 11019: Let VM sync to coordinate with possible VM-relocation under VMware when VM is in starting time 2011-08-11 17:51:56 -07:00
Kelven Yang 9e1ee30ea3 bug 11019: Let VM sync to coordinate with possible VM-relocation under VMware when VM is in starting time 2011-08-11 14:28:39 -07:00
Alex Huang 6e7ad8830f bug 11043: Propagating fix 2011-08-11 10:30:03 -07:00
Alex Huang 1079a77024 bug 11043: rverted the bad fix 2011-08-11 10:27:02 -07:00
alena 278f2a401f bug 10561: intermediate checkin for enable/disableStaticNat.
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
2011-08-11 10:19:22 -07:00
Chiradeep Vittal 924961d898 merge nectarine 2011-08-08 21:45:37 -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
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -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
Chiradeep Vittal 68a450b5a4 initialize search builder 2011-08-05 12:26:15 -07:00
Abhinandan Prateek 59d5080718 bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:18:42 +05:30
Abhinandan Prateek 415db5a126 bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:16:39 +05:30
Abhinandan Prateek 51e43be06c bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:14:28 +05:30
Kelven Yang d10c8e2a1d bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:30:50 -07:00
Kelven Yang 19567df49b bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:27:45 -07:00
anthony 7958ab566e bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed.
status 10964: resolved fixed
2011-08-04 16:09:22 -07:00
anthony 41759c153d bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed.
status 10964: resolved fixed
2011-08-04 16:08:50 -07:00
keshav 34a0c44f4f Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs. 2011-08-03 16:10:20 -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 bba811a714 Bug 10197:
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 17:29:16 -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
anthony 5f9884d97a Bug 10197:
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 16:48:27 -07:00
alena bdbc16f081 bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
status 10938: resolved fixed
2011-08-02 16:14:20 -07:00
alena 21afd1785a bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
status 10938: resolved fixed
2011-08-02 16:10:23 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Alex Huang 79ddba246d Revert "looks like lock tables don't return the tables locked"
This reverts commit 76781c10f8534acdd6f81c46952f88ade941e269.
2011-08-02 03:48:57 -07:00
Alex Huang 91550836cf looks like lock tables don't return the tables locked 2011-08-02 02:10:47 -07:00
Kelven Yang 04528c821b bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:40:29 -07:00
Kelven Yang a6a2383561 bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:38:14 -07:00
Kelven Yang 40f42a784f bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:33:02 -07:00
Edison Su 8bcad6960c add rhel6.1 support 2011-07-29 20:05:01 -07:00
Edison Su 22483a9c13 add RHEL 6.1 support 2011-07-29 19:14:15 -07:00
anthony 93244b5b62 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:57 -07:00
anthony 31100824d7 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:33 -07:00
anthony d48e97a368 bug 10768: root cause is StopCommand is not sent out in force stop,
status 10768: resolved fixed
2011-07-29 15:41:00 -07:00
Chiradeep Vittal 07c2f6cdc7 differentiate between dhcp server and elb vm 2011-07-27 12:00:07 -07:00
Alex Huang 200d2b9cd0 bug 10847: sg got executed in a big transaction leading to the deadlock 2011-07-25 17:41:11 -07:00
Murali Reddy 5322accbc8 bug 10764: changing service offering drops cpu cap
status 10764: resolved fixed
2011-07-25 18:23:11 +05:30
Murali Reddy 9e90999aab bug 10764: changing service offering drops cpu cap
status 10764: resolved fixed
2011-07-25 18:15:31 +05:30
alena d6112b1632 Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java
2011-07-21 16:04:55 -07:00
alena 3167c49687 bug 10736: when deploy vm in Basic zone, 1) send vmData/Password info to the Dhcp running in the same pod 2) send dhcp information to all pods in the system only when network.dns.basiczone.updates has "all" value
status 10736: resolved fixed
2011-07-20 16:50:58 -07:00
anthony d206bf7852 bug 10768: root cause is StopCommand is not sent out in force stop,
status 10768: resolved fixed
2011-07-20 16:47:48 -07:00
alena 36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
anthony d4ae9483cb bug 10768: root cause is StopCommand is not sent out in force stop,
status 10768: resolved fixed
2011-07-20 12:11:21 -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
Sheng Yang fa623c04e2 bug 10640: Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool
The old strategy is to deploy the second virtual router to diffent host only.

status 10640: resolved fixed
2011-07-19 15:06:15 -07:00
Sheng Yang e5e76881c6 Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool
The old strategy is to deploy the second virtual router to diffent host only.
2011-07-19 14:26:37 -07:00
alena 8c9fe2ec71 bug 9871: deployVm - check network's zone when do vm deployment
status 9871: resolved fixed

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-19 11:10:53 -07:00
alena c663217b00 bug 9642: listVms by regular user using domainId parameter will work only when domainId specified is the domainId the caller belongs to.
status 9642: resolved fixed
2011-07-19 11:10:52 -07:00
alena 19f7c9e26f Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call 2011-07-19 10:33:34 -07:00
alena e2eac341a4 bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all"
status 10710: resolved fixed

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/db/schema-228to229.sql
2011-07-19 10:33:34 -07:00
Sheng Yang 978b2640e2 Backport VirtualNetworkApplianceManager
Also:
1. Discard VPN related change.
2. Add network.dns.basiczone.updates in Config.java
3. Add findByNetworkOutsideThePod() for DomainRouterVO

Tested with VLAN and basic mode, works.

Disable redundant virtual router temporaily, would enable it after more testing.
2011-07-18 18:30:05 -07:00
Sheng Yang 4bc8686513 bug 10429: Backport redundant virtual router
Part 1

This backport contained:

commit 52317c718c25111c2535657139b541db0c9d1e1f
    bug 9154: Initial check in for enabling redundant virtual router

commit 54199112055d754371bfb141168fb5538bf6d6ea
    Add host verification for CheckRouterCommand

commit cef978a228c90056ead9be10cbc4de74c2b8de76
    Fix CheckRouterAnswer's isMaster report

commit 4072f0a6991ac3b63601a1764fbe14188965f62f
    Some build fixes and code refactoring for redundant router

commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
    Redundant Router: Fix OVS

commit 6a228830e7c46d819fa0c3317e159e041337e887
    Fix findByNetwork()/findByNetworkAndPod()'s return

commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
    Redundant Router: Fix isVmAlive()

commit e1275d2514adc41f8744f5107d4069c38be195f1
    Only issue CheckRouterCommand to redundant routers

And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes

in the master branch.
2011-07-18 18:29:56 -07:00
alena 5300dd52a9 bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm
status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-15 14:23:28 -07:00
alena 0d2787e2db bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well.
status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-15 14:20:52 -07:00
Kelven Yang 1081a3cfaa bug 10732: fix console proxy assignment issue 2011-07-14 21:56:34 -07:00
Kelven Yang 028d235716 bug 10732: fix console proxy assignment issue 2011-07-14 21:52:16 -07:00
alena 731c3bc20a bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all"
status 10710: resolved fixed
2011-07-14 16:28:13 -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
alena 1acfa6013d Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call 2011-07-11 18:26:15 -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
Alex Huang 186654b299 find templates that are not removed 2011-07-09 13:37:45 -07:00
Alex Huang fb8c3c032a find templates that are not removed 2011-07-09 13:37:26 -07:00
Alex Huang 040cffafca bug 10447: don't set the reservation id to null 2011-07-08 11:36:52 -07:00
Alex Huang b23c2a3c53 bug 10447: don't set the reservation id to null 2011-07-08 11:36:30 -07:00
Alex Huang 44666b6333 fixed the problem that vms in starting state were not being cleaned up when management server restarts 2011-07-08 00:05:55 -07:00
Alex Huang aa757f0303 fixed the problem that vms in starting state were not being cleaned up when management server restarts 2011-07-08 00:05:29 -07:00
Kelven Yang d0de1a5b94 bug 10620: allow ISO attachment failure to propogate up 2011-07-07 17:02:51 -07:00
Kelven Yang 25d2c893e6 bug 10620: allow ISO attachment failure to propogate up 2011-07-07 17:00:51 -07:00
alena 80ede648e3 bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
status 10629: resolved fixed
2011-07-07 15:48:02 -07:00
alena b92abc5333 bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
status 10629: resolved fixed
2011-07-07 15:42:44 -07:00
Edison Su 79f5ece7dc fix NPE in put primary storage into maintainance mode 2011-07-06 16:05:22 -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
Abhinandan Prateek 2aa1f3e596 bug 10570: fixed ISO id and name
status 10570: resolved fixed
2011-07-06 11:26:10 +05:30
Abhinandan Prateek c62ad3d11a bug 10570: fixed ISO id and name
status 10570: resolved fixed
2011-07-06 11:23:23 +05:30
alena deca4337c5 Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller 2011-07-05 13:37:39 -07:00
alena ba95181dc4 Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller 2011-07-05 13:35:29 -07:00
Abhinandan Prateek 5f12ea73a8 bug 8962: Completed moving VM from one account to another. 2011-07-04 13:15:40 +05:30
Nitin 62aab14e05 bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH.
Status 8915: resolved fixed
2011-07-04 12:01:04 +05:30
Kelven Yang 7512689dc8 bug 10546: move sending agent command out of transaction 2011-07-01 15:49:48 -07:00
Kelven Yang 7e6e097b58 bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue 2011-07-01 14:09:58 -07:00
Kelven Yang 3b46e7c695 bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue 2011-07-01 14:02:09 -07:00
kishan 9a6c567269 bug 10503: Skip usage events when StopAnswer details is Vm does not exist
status 10503: resolved fixed
2011-07-01 18:27:27 +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
Abhinandan Prateek 2a2611d6f6 group id is optional 2011-07-01 13:20:57 +05:30
Abhinandan Prateek 4120a07526 group id is optional 2011-07-01 13:17:32 +05:30
Abhinandan Prateek c15723a716 bug 10526: adding root device, volume type 2011-06-30 22:02:39 +05:30
Abhinandan Prateek ae665d4b11 bug 10526: adding root device, volume type 2011-06-30 21:58:44 +05:30
Abhinandan Prateek 6c17fd3c7d bug 10526: added state 2011-06-30 21:13:09 +05:30
Abhinandan Prateek c6bccec8ad bug 10526: added state 2011-06-30 21:07:22 +05:30
Nitin 62078ffef2 bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH.
Status 8915: resolved fixed
2011-06-30 16:31:02 +05:30
Abhinandan Prateek 6cfc59b454 bug 10489: addign object type to response 2011-06-30 13:31:55 +05:30
Abhinandan Prateek 978d811333 bug 10489: adding object name to response so that the front end displays it properly 2011-06-30 13:14:56 +05:30
Abhinandan Prateek c30225c2af bug 10489: self review updates 2011-06-30 11:07:37 +05:30
Abhinandan Prateek 6ba0b35295 bug 10489: improving listVM performance: Combined various queries to get Vm details into one single join, reduced the time required to 1/5 2011-06-30 11:05:18 +05:30
Abhinandan Prateek 8bdbfc78ea bug 10489: self review updates 2011-06-30 10:52:03 +05:30
Abhinandan Prateek f34252f2e0 bug 10489: improving listVM performance: Combined various queries to get Vm details into one single join, reduced the time required to 1/5 2011-06-30 09:55:35 +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 e186369c51 use correct secondary storage when creating template from snapshot 2011-06-28 19:16:34 -07:00
anthony b058a0226d use correct secondary storage when creating template from snapshot 2011-06-28 16:58:15 -07:00
Kelven Yang 1edf772f92 bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql 2011-06-28 15:00:34 -07:00
Kelven Yang 0059dd0e57 bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql 2011-06-28 14:57:02 -07:00
anthony 89b39d6a1a fixed compile warning 2011-06-28 11:00:16 -07:00
anthony 7cafe9eae4 fixed compile warning 2011-06-28 10:56:35 -07:00
root d46d1da86c bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
status 10455: resolved fixed
2011-06-28 19:55:09 +05:30
Nitin 35d4c304a9 bug 10455: CreatePrivateTemplate - If the volume's template id is null and it is ROOT (meaning that the vm was created out of a blank template) then take the source template id from the user vm table.
Status 10455: resolved fixed
2011-06-28 19:54:54 +05:30
root dbc0abfa69 bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
status 10455: resolved fixed
2011-06-28 14:29:11 +05:30
alena e716245218 bug 10447: don't allow to use system networks for vm deployment in Advance zone
status 10447: resolved fixed
2011-06-27 12:32:32 -07:00
alena 4e20cfd0ef bug 10447: don't allow to use system networks for vm deployment in Advance zone
status 10447: resolved fixed
2011-06-27 12:31:00 -07:00
anthony 9b56ac973e host is stucked in prepareMaintenance mode if you put last host into maintenance mode,
fixed

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-06-27 11:36:10 -07:00
anthony 3ab96b99af host is stucked in prepareMaintenance mode if you put last host into maintenance mode,
fixed
2011-06-27 11:33:23 -07:00
alena 18dc85c765 Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance) 2011-06-27 10:37:00 -07:00
alena 826f5eedf1 bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
status 10447: resolved fixed
2011-06-27 10:37:00 -07:00
alena f9d6685d18 bug 10456: get accountId info from the volume record when create template from volume
status 10456: resolved fixed
2011-06-27 10:37:00 -07:00
alena 41f12eb642 Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance) 2011-06-27 10:20:41 -07:00
alena 52fab0e35e bug 10456: get accountId info from the volume record when create template from volume
status 10456: resolved fixed
2011-06-27 10:20:40 -07:00
alena 0bf34f3612 bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
status 10447: resolved fixed
2011-06-27 10:20:40 -07:00
Alex Huang 791dd9777b logging changes 2011-06-27 10:19:53 -07:00
Alex Huang 97b562fc2a logging changes 2011-06-27 10:18:40 -07:00
Nitin 5810b838ed bug 10455: CreatePrivateTemplate - If the volume's template id is null and it is ROOT (meaning that the vm was created out of a blank template) then take the source template id from the user vm table.
Status 10455: resolved fixed
2011-06-27 17:20:42 +05:30
alena f42f7d8945 Always add default security group when deploy vm in basic zone 2011-06-23 20:00:49 -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
alena 9d76f6d719 Always add default security group when deploy vm in basic zone 2011-06-23 19:59:14 -07:00
alena d380ce0897 bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm
status 4706: resolved fixed
2011-06-23 11:31:39 -07:00
alena 38ffe66b66 bug 10424: send userData information only when vm is in one of the following states: Running, Starting, Stopping, Migrating
status 10424: resolved fixed
2011-06-23 11:06:52 -07:00
alena d196f1262f bug 10424: send userData information only when vm is in one of the following states: Running, Starting, Stopping, Migrating
status 10424: resolved fixed
2011-06-23 11:03:52 -07:00
Murali Reddy 8eb9ee6a8b Bug 10377 - API listAccounts return vmtotal=-14 2011-06-23 17:31:38 +05:30
Murali Reddy 1bfe6d8d72 Bug 10377 - API listAccounts return vmtotal=-14 2011-06-23 17:28:09 +05:30
Abhinandan Prateek 4922eda764 bug 10062: reverting the change as the error can be due to several factors in deployment of domain router 2011-06-23 10:56:21 +05:30
Abhinandan Prateek a1622d9f75 bug 10062: reverting the change as the error can be due to several factors in deployment of domain router 2011-06-23 10:41:37 +05:30
Kelven Yang be38384e76 bug 10414: update VM sync logic and capacity management to sync VM state change initiated from external source 2011-06-22 18:25:35 -07:00
Kelven Yang 7f8b129dc5 bug 10414: update VM sync logic and capacity management to sync VM state change initiated from external source 2011-06-22 18:23:43 -07:00
Murali Reddy 1d4bee51e7 Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource
status 10012: resolved fixed
2011-06-22 13:06:59 +05:30
Murali Reddy 34a36b7009 Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource
status 10012: resolved fixed
2011-06-22 13:00:59 +05:30
alena 4fcb406f2b bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well.
status 4706: resolved fixed
2011-06-21 16:41:43 -07:00