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
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
ea102aa045
add host guid in migrate command
2011-08-18 11:03:40 -07:00
035001bd19
Fix baremetal planner reply to non-baremetal VM when migration
2011-08-18 10:14:40 -07:00
523a32edaa
Fix baremetal planner reply to non-baremetal VM when migration
2011-08-18 10:14:16 -07:00
c2a769d993
fixed execptions while adding second host
2011-08-18 16:28:19 +05:30
2df6e5cc69
fixed execptions while adding second host
2011-08-18 16:26:00 +05:30
a9c67d23fa
bug 11099: Let VM sync to cooperate with migration process
2011-08-16 15:23:01 -07:00
ed7214c710
add host guid in migrate command
2011-08-16 10:30:52 -07:00
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
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
6e7ad8830f
bug 11043: Propagating fix
2011-08-11 10:30:03 -07:00
1079a77024
bug 11043: rverted the bad fix
2011-08-11 10:27:02 -07:00
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
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
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
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
f043f63eaa
Merged changes from 2.2.8.zucchini
2011-08-02 15:33:48 -07:00
79ddba246d
Revert "looks like lock tables don't return the tables locked"
...
This reverts commit 76781c10f8534acdd6f81c46952f88ade941e269.
2011-08-02 03:48:57 -07:00
91550836cf
looks like lock tables don't return the tables locked
2011-08-02 02:10:47 -07:00
93244b5b62
Bug 10197: if VM is already running, just return the host it is running on
2011-07-29 16:33:57 -07:00
31100824d7
Bug 10197: if VM is already running, just return the host it is running on
2011-07-29 16:33:33 -07:00
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
200d2b9cd0
bug 10847: sg got executed in a big transaction leading to the deadlock
2011-07-25 17:41:11 -07:00
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
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
427b73a2b9
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-20 11:13:56 +05:30
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
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
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
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
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
186654b299
find templates that are not removed
2011-07-09 13:37:45 -07:00
fb8c3c032a
find templates that are not removed
2011-07-09 13:37:26 -07:00
040cffafca
bug 10447: don't set the reservation id to null
2011-07-08 11:36:52 -07:00
b23c2a3c53
bug 10447: don't set the reservation id to null
2011-07-08 11:36:30 -07:00
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
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
36d7ee5634
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-01 16:37:53 +05:30
1edf772f92
bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql
2011-06-28 15:00:34 -07:00
0059dd0e57
bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql
2011-06-28 14:57:02 -07:00
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
3ab96b99af
host is stucked in prepareMaintenance mode if you put last host into maintenance mode,
...
fixed
2011-06-27 11:33:23 -07:00
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
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
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
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
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
8eb9ee6a8b
Bug 10377 - API listAccounts return vmtotal=-14
2011-06-23 17:31:38 +05:30
1bfe6d8d72
Bug 10377 - API listAccounts return vmtotal=-14
2011-06-23 17:28:09 +05:30
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
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
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
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
da402fdd35
added back @DB annotation
2011-06-21 10:44:46 -07:00
07354b441c
added back @DB annotation
2011-06-21 10:44:32 -07:00
22e28b4941
bug 10368: better fix for the db connection problem.
2011-06-20 16:31:32 -07:00
36ceb02abe
removed useless manager declarations
2011-06-20 16:31:32 -07:00
a58d730e34
bug 10368: Print out the hash code of the db connection instead of the toString(). Changed the transaction in changeToStart() method to be of a shorter interval so it won't cause so many db connection exceptions
2011-06-20 16:31:32 -07:00
78d19f8690
bug 10368: better fix for the db connection problem.
2011-06-20 16:30:38 -07:00
dc605655a0
removed useless manager declarations
2011-06-20 16:20:48 -07:00
50c1652172
bug 8996: make VMsync to track host change
2011-06-20 16:13:46 -07:00
7279dad925
bug 8996: make VMsync to track host change
2011-06-20 16:12:33 -07:00
e4f42d0e52
bug 10368: Print out the hash code of the db connection instead of the toString(). Changed the transaction in changeToStart() method to be of a shorter interval so it won't cause so many db connection exceptions
2011-06-20 11:30:23 -07:00
9d4311cc0a
bug 10352: fixed the issue. I mistakenly threw an exception when I was not suppose to
2011-06-17 17:18:28 -07:00
36ee97334b
bug 10352: fixed the issue. I mistakenly threw an exception when I was not suppose to
2011-06-17 17:18:04 -07:00
2a6307f272
1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled
2011-06-16 16:22:11 -07:00
464d793754
1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled
2011-06-15 18:37:38 -07:00
61cdbd0e1f
bug 10062: better error message
...
status 10062: resolved fixed
2011-06-15 09:56:42 +05:30
db94ece73b
bug 10062: better error message
2011-06-15 10:05:45 +05:30
59fc206664
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:33:10 -07:00
63113661d1
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:33:09 -07:00
d39048faca
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:33:09 -07:00
1ac7276942
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:36:32 -07:00
1561275838
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:35:34 -07:00
1d7e70acd1
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:35:20 -07:00
0c92bf5b79
Some build fixes and code refactoring for redundant router
2011-06-07 14:47:46 -07:00
62ac899091
bug 9154: Initial check in for enabling redundant virtual router
...
This patch enable redundant virtual routers.
1. To enable this feature, db need to be updated using follow SQL by now(we
would get a UI way later):
UPDATE network_offerings SET redundant_router=1 WHERE guest_type="Virtual" AND
system_only=0;
2. System would try to start up two routers at different hosts. But if there is
only one host in the zone, system would start up two routers on it.
3. The failover part is using keepalived, and connection tracking part is using
conntrackd. There would be one master router and one backup router. The status
of router(master or backup) can be query from the database table domain_router
now. Management server would update the status every 30s by default.
4. The routers for the same zone would use same external NIC(same ip and mac).
The script used for fail-over would ensure only one external NIC present in the
network at any time.
5. Currently management server don't got the ability to stop one of router is
both of them reported as master. The feature is in the todo list.
After two routers start up, disconnect anyone of them, the guest network
shouldn't be affected, and established connection(http, ssh, etc.) should still
works. The fail-over on gateway part should be 3~4 seconds.
Currently the patch works with KVM. Would deal with vmware and XenServer soon.
2011-06-07 14:47:45 -07:00
d9e0bcfa1e
bug 10126: Renamed getPodId() to getPodIdToDeployIn()
2011-06-03 22:17:08 -07:00
2ceadec326
bug 9651: tags parameter added to createnetwork
2011-06-01 17:36:14 -07:00
9961e1ca2a
Fix NPE when reboot vm
...
vm.podId has different meaning than you think
2011-06-01 11:54:20 -07:00
e552f118af
propagated bf8afdbc7af3c0e9fbc90c841fedec57ac7b8cdf
2011-05-17 16:02:44 -07:00
ea9703997b
proxy agent
2011-05-17 07:12:58 -07:00
029a9e6a8a
bug 9815: ClassCastException: com.cloud.agent.api.Answer cannot be cast to com.cloud.agent.api.StopAnswer
...
status 9815: resolved fixed
The type cast should be done after making sure that the command was successful. Otherwise you may have the base Answer returned.
2011-05-10 11:41:20 +05:30
4c89cc57ae
Bug 9652: Need to provide a way to specify deployment plan during VM start
...
Changes:
- Throw an exception if the deployment plan passed into start() cannot be satisfied by the current constraints (such as root volume is already created in a pool in a different
cluster).
2011-05-06 14:39:53 -07:00
7bc25643a9
propagating fix from 2.2.4
2011-05-05 17:57:06 -07:00
117a81acf6
cleanup agent manager
2011-05-05 17:57:06 -07:00
9aba817256
Bug 9652: Need to provide a way to specify deployment plan during VM start
...
Changes:
- Added a new parameter to pass in deployment plan during vm start
- If a hostId is passed in to the DeployVMCmd (only allowed for a root admin to test a host), a plan is passed in to start the vm in that host's datacenter, pod and cluster and on that host
- If a plan is passed in during start, but if the VM's root volume is READY, then plan of the root volume takes precedence. In that case the plan passed in is not used.
2011-05-04 15:02:52 -07:00
fba1c95512
bug 9615: Part of the HA cleanup
2011-05-03 16:34:53 -07:00
8c8354a00e
bug 8745: we decided on not implementing revert on the agent because it really requires business logic above. Stop if the checkSsh doesn't work
2011-05-02 14:47:49 -07:00
93eb893c22
misuse instanceName and name, which causes vm sync behavior weirdly
2011-04-29 19:01:46 -07:00
bbc470ed4f
bug 9619: handle two types of domr name
...
status 9619: resolved fixed
2011-04-29 14:13:25 -07:00
99bc15f64a
changed getName to getHostname
2011-04-29 08:34:10 -07:00
209be1065b
Bug 9585 - Existing Data Disk is being destroyed and recreated on Stop and Start of a User VM.
...
Changes:
- When the ROOT volume of a VM is found to be READY, changed planner to reuse the pool for every volume(root or data) that is READY and that has a pool not in maintenance and not in avoid state
- If ROOT volume is not ready, we dont care about the DATA disk. Both would get re-allocated.
- When a pool is reused for a ready volume, Planner does not call storagepool allocators. And such volumes are not assigned a pool in the deployment destination returned by the planner. Accordingly StorageManager :: prepare method wont recreate these volumes since they are not mentioned in the destination.
2011-04-27 11:36:51 -07:00
6e39019b6a
Bug 9548 [Cloud Stack Upgrade - 2.1.8 to 2.2.4] System VM's Volumes Recreation is not happening on an event of New Volume creation Failures
...
Changes:
- Reason was that the old volume's templateId was being updated before volume creation was attempted. So on the retry, we dint find a difference in volume's templateId and VM's templateId and did not enter the recreation logic.
- Fix is to update the new volume's templateId with the VM's templateId while creating the new volume. The old volume's templateId stays the same and the volume is marked as 'Destroy' when a new volume is created.
2011-04-26 11:35:24 -07:00
435c20c0cc
Bug 9273: resource cont going -ve
...
adding addtional check that ensure we decrease the count in advanceStart only on new vm creation.
2011-04-22 01:19:23 +05:30
22ee7117f5
bug 9521: fixed NPE in finalizeCommandsOnStart() method by adding vm's nic to vm profile during the vm to vmProfile conversion.
...
status 9521: resolved fixed
Conflicts:
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-04-20 16:16:01 -07:00
f881d394e2
bug 9415: deleteHost - cleanup vms running on the host to be removed
...
status 9415: resolved fixed
2011-04-20 15:50:10 -07:00
7103e1c9a7
global replacement to avoid using getClass().getName() for unique names
2011-04-19 17:26:41 -07:00
92155522f2
Add license header to files
2011-04-14 11:23:14 -07:00
Kelven Yang
alena
Edison Su
frank
Abhinandan Prateek
Alex Huang
anthony
kishan
Sheng Yang
Murali Reddy
prachi