Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							78a5b651ac 
							
						 
					 
					
						
						
							
							bug 11425: dont count direct IP in resource count while updating resource count through API  
						
						 
						
						... 
						
						
						
						status 11425: resolved fixed 
						
						
					 
					
						2011-09-14 22:52:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							20f0707755 
							
						 
					 
					
						
						
							
							bug 11190: My changes got reverted. Putting them back - Treating the max account limits with -1 values as infinite  
						
						 
						
						
						
						
					 
					
						2011-09-14 19:35:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cbd2b6bc 
							
						 
					 
					
						
						
							
							bug 11275:  
						
						 
						
						... 
						
						
						
						remove heartbeat entry for this Primary Storage, when put this Primary Storage into maintenance mode
create heartbeat entry for this Primary Storage, when cancal maintenance for this Primary Storage
status 11275: resolved fixed 
						
						
					 
					
						2011-09-13 22:15:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							71385f7cc0 
							
						 
					 
					
						
						
							
							check hypervisorType and StoragePoolType in OCFS2 manager when delete host  
						
						 
						
						... 
						
						
						
						don't take lock in processResourceEvent() 
						
						
					 
					
						2011-09-13 17:35:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							45c595d558 
							
						 
					 
					
						
						
							
							Don't update resource count for system account  
						
						 
						
						
						
						
					 
					
						2011-09-13 16:58:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							569427ba1f 
							
						 
					 
					
						
						
							
							bug 11036: if resource_count record is missing for account or domain, insert it during the management server startup (with count=0)  
						
						 
						
						... 
						
						
						
						status 11036: resolved fixed 
						
						
					 
					
						2011-09-13 15:23:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f071ce571c 
							
						 
					 
					
						
						
							
							bug 10949: if a cluster doesn't have any hosts, set cluster guid to new one when add host to this cluster.  
						
						 
						
						... 
						
						
						
						status 10949: resolved fixed 
						
						
					 
					
						2011-09-13 13:53:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b05c69f3b3 
							
						 
					 
					
						
						
							
							bug 11246: return lb rule Id in the async response for createLoadBalancer api  
						
						 
						
						... 
						
						
						
						status 11246: resolved fixed 
						
						
					 
					
						2011-09-13 12:08:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c5bc16ef42 
							
						 
					 
					
						
						
							
							XcpServerDiscoverer is only for XenServer  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:11:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							d2293137c7 
							
						 
					 
					
						
						
							
							bug 11199: Moved DB upgrade changes to schema-2211to2212-premium  
						
						 
						
						... 
						
						
						
						status 11199: resolved fixed 
						
						
					 
					
						2011-09-13 23:28:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a79c603f 
							
						 
					 
					
						
						
							
							bug 11036: resource count update is refactored  
						
						 
						
						... 
						
						
						
						status 11036: resolved fixed
1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains
Conflicts:
	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java 
						
						
					 
					
						2011-09-13 10:47:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							9b424a762d 
							
						 
					 
					
						
						
							
							fix compilation of mocks  
						
						 
						
						
						
						
					 
					
						2011-09-13 09:22:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ae64c56c12 
							
						 
					 
					
						
						
							
							bug 11413: when mark host ad disconnected, set lastping to now - pingtimeout  
						
						 
						
						... 
						
						
						
						status 11413: resolved fixed 
						
						
					 
					
						2011-09-12 18:50:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						 
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3c6efb81 
							
						 
					 
					
						
						
							
							Retry only a few times  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fae5e84699 
							
						 
					 
					
						
						
							
							if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat  
						
						 
						
						... 
						
						
						
						change some logs to debug level 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							65fb83035f 
							
						 
					 
					
						
						
							
							Enable monitoring over JMX  
						
						 
						
						... 
						
						
						
						Add the ability to disable some vms from being scheduled
Add ability to trigger ruleset updates from JMX
added a few more dangerous JMX operations 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d81bc5a375 
							
						 
					 
					
						
						
							
							Dequeue the vm with the largest id first -- this ensures that newly started vms get updated early  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							925f5f2f09 
							
						 
					 
					
						
						
							
							Retry 3 times on deadlock: if not updated, then throw a runtime exception to roll back the vm start  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							82fcfe8edc 
							
						 
					 
					
						
						
							
							make signature calculation consistent across management servers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							37b4384990 
							
						 
					 
					
						
						
							
							retry a transaction if it deadlocks  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							c21a214372 
							
						 
					 
					
						
						
							
							if true, this could lead to the dog chasing its own tail  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5dba8cf430 
							
						 
					 
					
						
						
							
							only update sequence number when asked to. full sync SHOULD NOT request sequence number updates since this will lead to the dog chasing its own tail  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							6252d605c1 
							
						 
					 
					
						
						
							
							Avoid going back to the nics table for information we already have  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c5af720 
							
						 
					 
					
						
						
							
							make instance_id unique to allow usage of ON DUPLICATE KEY  
						
						 
						
						... 
						
						
						
						useful logging
Reduce batch size to 16 to avoid sql errors
try using multi inserts to overcome deadlock during batch update 
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							7e2c2c627f 
							
						 
					 
					
						
						
							
							unit test for SG mgr v2  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b52d1157e9 
							
						 
					 
					
						
						
							
							use the new implementation of SG manager  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							4cd6a9217c 
							
						 
					 
					
						
						
							
							Use hashset since it is 50% faster. we can use treeset when we support priority  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc782b8ba 
							
						 
					 
					
						
						
							
							Add basic Mocks for some managers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							abf4754503 
							
						 
					 
					
						
						
							
							New security group mgr WIP : memory based queueing  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							f41b352d36 
							
						 
					 
					
						
						
							
							revert egress rules implementation pending review  
						
						 
						
						... 
						
						
						
						Reverts a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4
Reverts 24e4e44b8f0712a37147a3777833de3f9e24829e 
						
						
					 
					
						2011-09-12 14:45:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d817f3c364 
							
						 
					 
					
						
						
							
							Revert "bug 10617:  Added Egress rules to Security groups."  
						
						 
						
						... 
						
						
						
						revert pending review
This reverts commit a19212703b9734ebd44ebf55cfdd81ebdc9d7fe4. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e216686029 
							
						 
					 
					
						
						
							
							Revert "bug 10617: Intermediate checking"  
						
						 
						
						... 
						
						
						
						revert pending review
This reverts commit 561b27565512d438db3d8896df6f97b644b0b498. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							cbe996e1ce 
							
						 
					 
					
						
						
							
							bug 11403: Making hypervisor_type of xs-tools.iso (id=200) as XenServer. Made the corresponding DB changes as well.  
						
						 
						
						
						
						
					 
					
						2011-09-13 03:07:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d828f4e434 
							
						 
					 
					
						
						
							
							Bug 11350 - Baremetal destroy instance doesnt power off machine  
						
						 
						
						... 
						
						
						
						status 11350: resolved fixed 
						
						
					 
					
						2011-09-12 14:17:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							299ae3ed91 
							
						 
					 
					
						
						
							
							fixed typo  
						
						 
						
						
						
						
					 
					
						2011-09-12 12:38:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							b30827a0ec 
							
						 
					 
					
						
						
							
							bug 9778: Log snapshot create event only if the snapshot is in not removed state after backingUp to secondary. Log snapshot delete event for backed up snapshots only  
						
						 
						
						... 
						
						
						
						status 9778: resolved fixed 
						
						
					 
					
						2011-09-12 20:22:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							5928a9b370 
							
						 
					 
					
						
						
							
							bug 9778: Log snapshot create event only if the snapshot is in not removed state after backingUp to secondary. Log snapshot delete event for backed up snapshots only  
						
						 
						
						... 
						
						
						
						status 9778: resolved fixed 
						
						
					 
					
						2011-09-12 20:01:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							3e096afba6 
							
						 
					 
					
						
						
							
							bug 10974: Fixed a bug in the search for listRouters API. The bug was introduced due to change in the VmInstancVO where the name field was changed to hostName. This went unnoticed in the DAO layer as we dont throw an exception but an assert error.  
						
						 
						
						
						
						
					 
					
						2011-09-12 16:51:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							002d0fda5a 
							
						 
					 
					
						
						
							
							bug 11190: Treating the max account limits with -1 values as infinite. When acquiring a lock to check for resourceLimitExceeded if the lock times out then return as limit exceeded.  
						
						 
						
						
						
						
					 
					
						2011-09-12 14:26:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c41775184 
							
						 
					 
					
						
						
							
							1) Increase working buffer size to 1M  when downloading/uploading VMDK, hopefully can improve OVF exporting/importing performance. 2) use atomic SQL operation to get rid of global lock usage  
						
						 
						
						
						
						
					 
					
						2011-09-09 17:07:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b0962ad9 
							
						 
					 
					
						
						
							
							bug 10617: Intermediate checking  
						
						 
						
						... 
						
						
						
						Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.
   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm 
						
						
					 
					
						2011-09-09 18:14:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							50efe56335 
							
						 
					 
					
						
						
							
							bug 11051: listHostsCmd - Fixed the capacity and stats response. Also removed the unwarranted code.  
						
						 
						
						
						
						
					 
					
						2011-09-09 14:23:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							4e663bbef9 
							
						 
					 
					
						
						
							
							bug 8338: Added usage.aggregation.range parameter. Also included in 2211 to 2212 upgrade  
						
						 
						
						
						
						
					 
					
						2011-09-09 13:43:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							e3252e5e66 
							
						 
					 
					
						
						
							
							Excluded external firewall/LB from host stats collection, and included them in ping checks  
						
						 
						
						
						
						
					 
					
						2011-09-08 16:43:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7f06d7eb 
							
						 
					 
					
						
						
							
							bug 11384: deprecate vmware.guest.nic.device.type global configuration variable  
						
						 
						
						
						
						
					 
					
						2011-09-08 16:11:17 -07:00