Commit Graph

631 Commits

Author SHA1 Message Date
Alex Huang 1d3a443237 Added support for component libraries in plugins 2012-08-07 15:40:01 -07:00
Alena Prokharchyk d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
Alena Prokharchyk cf64fda5d5 VPC: unittest preparation
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
Sheng Yang 84a1a311f9 S2S VPN: CS-15511: Add PFS support for VPN connection 2012-08-06 15:27:13 -07:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Chip Childers 95ce55f0a1 License header updates for the utils folder 2012-08-03 14:15:09 -04:00
Alena Prokharchyk 0588c9748c VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
Alena Prokharchyk 8f797afd42 VPC: CS-15813 - ICMP type and code validation
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
Sheng Yang e8d2ca48b4 S2S VPN: Update the supported crypto list
We would support 3DES, AES128, AES192, AES256.
2012-07-30 16:43:55 -07:00
Sheng Yang e9ae7336c1 CS-15649: Remove DES from s2s vpn support policy
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
Sheng Yang c0fcca3990 CS-15511: Not allow pfs parameter for customer VPN gateway 2012-07-19 15:10:31 -07:00
Alena Prokharchyk 4a7149e6b5 VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
David Nalley 53d5fe6636 fixing another license header 2012-07-04 19:47:12 -04:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc
Conflicts:
	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/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
Alena Prokharchyk 46b97cbf7d VPC: update public IP info in domain_router table once the VR gets the public nic 2012-06-28 10:25:24 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Alena Prokharchyk 55a12582b4 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-20 15:45:08 -07:00
Vijayendra Bhamidipati fe76cf8a60 CS-15241: static NAT is not working when provider is set to Juniper SRX
Description:

	Checking in fix for the exception seen due to the absence of
	the AsyncCommandQueued exception in the map of CSExceptionErrorCode
	which is used to look up the error code corresponding to a
	cloudstack exception. Also printing the stack trace in case
	an exception is not found in the map.
2012-06-19 11:44:48 -07:00
Vijayendra Bhamidipati e177b8d6f6 CS-15241: static NAT is not working when provider is set to Juniper SRX
Description:

	Checking in fix for the exception seen due to the absence of
	the AsyncCommandQueued exception in the map of CSExceptionErrorCode
	which is used to look up the error code corresponding to a
	cloudstack exception. Also printing the stack trace in case
	an exception is not found in the map.

Conflicts:

	utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
2012-06-15 14:29:12 -07:00
David Nalley b7ca7f8df2 Doh, broke the build - fixing that. 2012-06-06 23:21:54 -04:00
David Nalley 937a9f7c45 fixing utils license header 2012-06-06 23:06:02 -04:00
Devdeep Singh 0e3bf8cabb CS-14956: Fixing an issue that surfaced while testing rate limiting
policies. An error was getting reported during policy map creation that
config operation was in progress, Added synchronization to make sure
sending and receiving commands are seralized. Also removed the retry logic
as after this change it is not needed.

Reviewed-By: Vijay
2012-05-25 19:35:34 -07:00
Vijayendra Bhamidipati ec83e0e939 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removing the CiscoNexusVSMService class since
	we don't use it anywhere.
2012-05-25 18:38:42 -07:00
Devdeep Singh 5fc5b7a0eb CS-9919: Adding helper routines to query details of a port profile and
associated policy maps. Also updating the error message logs.
2012-05-25 18:24:20 -07:00
Devdeep Singh 3006bed6df CS-14948: Fixing an issue with parsing the xml-rpc response to a command
from vsm. This was throwing false exceptions when infact the command
execution was a success. Also adding retry logic for create port profile
request.
2012-05-25 18:08:48 -07:00
Sateesh Chodapuneedi 6d896951b3 CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Description:

	Increasing the window for xmlstream.
2012-05-25 17:41:31 -07:00
Devdeep Singh 8db1ca296b CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Do not set the access mode of an interface if vlanid is zero.
2012-05-25 17:41:17 -07:00
Devdeep Singh 8d1b9c2477 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Adding api to remove from a service policy
	(policy map) from a port profile.
2012-05-25 17:36:48 -07:00
Devdeep Singh ec19facd30 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Adding apis to create service policies and
	associate them with a port profile.
2012-05-25 17:36:42 -07:00
Devdeep Singh 0e293b7b5b CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Made changes to persist the vsm configuration
	after updating it.
2012-05-25 17:18:11 -07:00
Devdeep Singh 76e1d338f3 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Adding a helper routine for modifying port
	profile configuration.
2012-05-25 17:18:04 -07:00
Devdeep Singh 4ff2893ffc CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Updated the add port profile routine to support
	more options (bindingtype, switchport mode, port
	profile types).
2012-05-25 17:17:43 -07:00
Devdeep Singh 441a811927 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Added handling for error responses from vsm.
	Fixing an issue with port profile creation.
2012-05-25 17:17:02 -07:00
Devdeep Singh 3fd32c1784 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Removing unused classes and references to them.
2012-05-25 17:16:55 -07:00
Devdeep Singh 631cc863e1 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Updated the rpc request generation logic for
	creating and deleting port profiles.
2012-05-25 17:16:48 -07:00
Vijayendra Bhamidipati 5109902c9f CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Update create-schema.sql to create tables for
	VSM and VSM-Cluster mapping.

	Fixed an incorrect exception path in
	CSExceptionErrorCode.

Conflicts:

	utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
2012-05-25 17:11:49 -07:00
Devdeep Singh 1198a62453 CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Description:

	Adding a netconf helper class for adding and
	deleting port profiles. These functions need
	to be further parameterized and error handling
	needs to be taken care of.
2012-05-25 17:09:54 -07:00
Vijayendra Bhamidipati b0facd16e4 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
At this point, the mgmt server comes up, loading the
	   Nexus related modules without dying.

Description:

	1) Added a new properties file for Cisco N1kv VSM commands:
		cisconexusvsm_commands.properties.in

	2) Added the CiscoNexusVSMElement to the components.xml file.

	3) Modified CiscoNexusVSMElement to implement NetworkElement.

		The NetworkElement interface functions are not
	  	relevant to the N1KV VSM, so we override them
	  	with noops.

	4) Added an addDao() of CiscoNexusVSMDeviceDaoImpl in populateDaos(),
	   else we'd run into a failure to look up the VSM's dao when the
	   mgmt server is starting up:

		com.cloud.utils.exception.CloudRuntimeException: Unable to find DAO com.cloud.network.dao.CiscoNexusVSMDeviceDao

	5) Also added the CiscoNexusVSMElementService in populateServices(),
	   and modified CiscoNexusVSMElement to implement Manager as well.

	6) populateServices() was running into an exception that indicated
	   that it was unable to find a commands.properties file for the
	   cisco n1kv vsm service. Fixed it by changing getProperties() in
	   CiscoNexusVSMElement to return the correct string
	   "cisconexusvsm_commands.properties", and putting in an @Override
	   for getProperties() in CiscoNexusVSMElement. Also fixed up all
	   the other functions in CiscoNexusVSMElement that needed to have
	   @Override. Also updated build/developers.xml with this file
	   location. And did other small cleanup.

	7) More clean up in CiscoNexusVSMDeviceManagerImpl.

Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
2012-05-25 17:07:03 -07:00
Vijayendra Bhamidipati 32ba2ef17a CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Reviewed by: Sateesh Chodapuneedi, Devdeep Singh

Description:

This is the first in a series of commits for integrating the
Cloudstack Management Server with the Nexus 1000v Virtual
Supervisor Module.

These changes introduce the necessary API command interfaces
to work with a Cisco N1KV VSM. The backend logic is still to
be put in and will be incorporated in subsequent commits.
Please do not attempt to use these APIs until then. Also,
these are not yet filled in into commands.xml, so they are
not currently exposed.

Additional APIs would be added if required.

These changes will not break any current management server
functionality.

Given below is a description of the changes put in here:

	Added Cisco N1KV commands to core/api:
	    These are the added commands -

		AddCiscoNexusVSMCmd
		DeleteCiscoNexusVSMCmd
		ConfigureCiscoNexusVSMCmd
		ListCiscoNexusVSMCmd
		ListCiscoNexusVSMNetworksCmd

	Added a Network Element service file for Cisco N1KV.

	Declared the interface functions that we'll need for
	the N1KV VSM.

	Defined a DeviceVO file for the Cisco Nexus Element.

	Created a response file for Cisco Nexus VSM.

	Created new event types for external Switching Management devices.

	Put in logic to call interface methods in ListCiscoNexusVSMNetworksCmd
	and ListCiscoNexusVSMCmd

NOT VSM RELATED:
	Fixed minor typo in some of the event types for external load balancers.

       Added properties of a VSM in the VSM VO class.

       Replaced the "url" input parameter by "ipaddress"
       in the AddCiscoNexusVSMCmd API.

       Added a new file - CiscoNexusVSMElement.java to
       contain the implementation of the functions
       declared in the VSMElementService interface, and
       put in implementations of the functions for the
       Nexus VSM API commands. These functions are
       defined in the CiscoNexusVSMElement class.

       Added a class for Port Profiles (PortProfile.java).
       The fields in this class are still not correctly
       declared as of now. We'll make the required changes
       going forward.

	Added CiscoNexusVSMDeviceManagerImpl class.

	Added CiscoNexusVSMResource class.

	Created a new class to provide a package to
	connect to Cisco Nexus VSMs. This will be a
	set of Java wrapper functions that allow us
	to connect/disconnect and send commands and
	receive the results of those commands via
	XML-RPC. These functions are yet to be
	implemented, and will be checked in in future
	commits.

	Added two new classes, VSMCommand and
	VSMResponse, to encapsulate XML-RPCcommands
	and responses to and from a Ciscon Nexus VSM.

	Put in the following function stubs inside the
	CiscoNexusVSMService class:

		connectToVSM()
		disconnectFromVSM()
		executeVSMCommand()

	Added new field in the Type enum of the "Host"
	interface, for Cisco Nexus VSMs.

	Added two parameters to AddCiscoNexusVSMCommand
		vsmName
		zoneId

	Modified the CiscoNexusVSMDeviceVO constructor to
	take in an zoneId as a parameter when creating
	the VO object.

	Added new interface and class for the DeviceDao
	implementation for Cisco Nexus VSM devices:
		CiscoNexusVSMDeviceDao
		CiscoNexusVSMDeviceDaoImpl

	Removed the vsmvCenterDomainId property, since it's
	going to the same as vsmDomainId, which is the VSM's
	switch Domain Id.

	Have started putting in the following query functions
	in the CiscoNexusVSMDeviceDao interface:

	Put in DAO implementations of some of the above functions in the CiscoNexusVSMDeviceDaoImpl class.

	Added a vsmName parameter to the CiscoNexusVSMDeviceVO class.
2012-05-25 17:05:15 -07:00
frank bd47cd104c CloudStack CS-14475
Atomatic addition of Apache license header broke lots of mysql files

fix DB upgrade cleanup script not get executed issue.

add "#" as comment signature in ScriptRunner.java
2012-04-13 15:34:59 -07:00
Alex Huang 7c6932ef80 some reformatting and a new way to get vos into the system 2012-04-12 11:04:38 -07:00
David Nalley 91fadc4a0d fixing line ends in utils 2012-04-09 20:05:41 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Vijayendra Bhamidipati 005ba5e2b5 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.
2012-03-15 16:27:52 -07:00
Vijayendra Bhamidipati 6ac79c4be2 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Adding a new class AnnotationHelper, that provides routines
	to read annotations from a VO class.

	Cloudstack does the mapping between cloudstack java VO objects
	and the database tables using cglib. cglib creates proxy objects
	as the maps between VO objects and the database.  A VO (value
	object) class is populated after querying from the MYSQL database.

	Ideally, a getAnnotation() issued on a cglib proxy object should
	get a list of all the annotations in all classes in the inheritence
	chain. However, this functionality seems to be currently broken
	in cglib.  Hence, when querying for annotations given the object
	of a VO class, we need to get to the corresponding VO class of that
	cglib proxy class and issue a getAnnotation() on that class. To get
	the VO class, we simply need to get the super class of the proxy
	object. Also, we need to recurse to the root VO class in case the
	VO class extends another VO class.

	Note that the cache used by CS is ehcache.
2012-03-08 17:34:28 -08:00
Vijayendra Bhamidipati 96f8111558 Bug 14060: Include a CloudStack error code in an Exception Response
Description:

	Missed fully qualifying ServerApiException in hashmap.
	Fixing it with this commit.
2012-03-08 11:19:13 -08:00
Vijayendra Bhamidipati 57c54e23d6 Bug 14060: Include a CloudStack error code in an Exception Response
Bug 13127: API error text refer to database ids instead of uuids

Code-Reviewers: Ewan Mellor, Kelven Yang

Description:

	1. A new class CSExceptionErrorCode has been added to utils.
	   It contains a list of error codes for each type of
	   Exception class. Use fully qualified package paths for
	   Exceptions in CSExceptionErrorCode.  We log any exception
	   name not found in the list of error codes for exceptions.

	2. Whenever we throw an exception exobj anywhere in the
	   CS code, the CSErrorCode is set in the base class
	   constructor.

	3. We add a new field csErrorCode in classes CloudException,
	   RuntimeCloudException, ExecutionException and
	   ExceptionResponse.

	4. Two places in ApiServer.java were wrongly modified when
	   putting in changes for bug 13127 to not throw an exception.
	   This has been corrected in this commit.
2012-03-05 17:39:09 -08:00
Vijayendra Bhamidipati 59631452b9 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Modify Exception handling to enable addition of multiple
	uuids in a single exception thrown by API functions. Both
	XML and JSON outputs will store all uuids and Fieldnames.
	This will make it easier to provide more information when
	an exception occurs - for example, a zone id, a cluster id,
	host id, and then a specific property id.
2012-02-27 17:55:03 -08:00
Vijayendra Bhamidipati bfe1122bc6 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Added a field name for the db id in the IdentityProxy class, and
	modified setProxyObject() to take an additional id name parameter.
	This will let us know the name of the uuid that we are returning.
	E.g.- domainId, zoneId, etc. The client can view this field in
	the json/xml output. Modified the JSON/XML serialization routines
	to append this new parameter to the serialized output for Exception
	Responses.
2012-02-27 17:55:01 -08:00
Vijayendra Bhamidipati c3fbe29cf8 Bug 13127: API error text refer to database ids instead of uuids
Description:

	1) Added a setProxyObject() method to CloudException and RuntimeCloudException
	2) Modified a bunch of throw exceptions in NetworkManagerImpl.java to call setProxyObject() before throwing an exception.
	3) Changed scope of ProxyIdentity attribute to protected.
	4) Added routines to ServerApiException to get/set IdentityProxy object, and
	   routine in RuntimeCloudException to get the Idproxy object.
	5) Modified the exception handling around the dispatcher and handlerequest()
	   to copy over the IdentityProxy information before rethrowing an exception
	   eventually back to handle().
	6) Removed duplicate IdentityProxy object in ServerApiException.
	   It was extending RuntimeCloudException which already had an
	   IdentityProxy object.
2012-02-27 17:54:56 -08:00
Vijayendra Bhamidipati 768d7a2a26 Bug 13127: API error text refer to database ids instead of uuids
Description:

1)	Moved RuntimeCloudException from api/ to utils/.

	Added simple constructor to RuntimeCloudException.

	Modified all classes that extended RuntimeException
	to extend RuntimeCloudException. These classes
	are listed below:

		ServerApiException
		CloudAuthenticationException
		CloudExecutionException
		AsyncCommandQueued
		HypervisorVersionChangedException
		RuntimeCloudException

2)	Added overloaded constructed to CloudException.
	Modified all classes that extend Exception to extend CloudException instead.
	These classes are listed below:

		ConcurrentOperationException
                ConflictingNetworkSettingsException
                ConnectionException
                DiscoveryException
                InsufficientCapacityException
                ManagementServerException
                ResourceUnavailableException
                VirtualMachineMigrationException
                AgentControlChannelException
                OperationTimedoutException.java
                UnsupportedVersionException.java
                UsageServerException.java
                UnableDeleteHostException.java
                AgentAuthnException.java
                HttpCallException.java
                ActiveFencingException.java
                ClusterInvalidSessionException.java
                GreTunnelException.java
                OvsVlanExhaustedException.java
2012-02-27 17:54:53 -08:00
U-CITRITE\vijayendra1 698c1ebe12 Bug 13127: API error text refer to database ids instead of uuids
Description:

1)	Adding two new classes, CloudException and RunTimeCloudException.
	The former extends Exception and the latter RunTimeException.
	These will be used by classes that formerly directly extended
	Exception and RuntimeException. These two classes have an attribute
	of type IdentityProxy to enable exceptions fill in db ids in separate
	attribute fields rather than in a string. Doing so will allow the
	serialization module (GSON for JSON and other for XML) to kick in
	and convert this db id to a uuid in ApiServer.java just before the
	JSON/XML responses are sent out.

2)	Moving IdentityProxy.java from api/ to utils/ since
	both CloudException and RuntimeCloudException refer to it.

3)	Changing references to IdentityProxy class from api/ to utils/.

4)	While rebasing to master, a new file was added, merging
	api/src/com/cloud/api/response/IsoVmResponse.java to this diff.
2012-02-27 17:54:50 -08:00
frank e0072edf4b Bug 13962 - CloudRuntimeException: Failed to update keypairs on disk: cannot create key file null/.ssh/id_rsa
using a flag instead of calculating timeout value. The monitor thread may have inaccurate execution time which
 may cause script forever hang

 status 13962: resolved fixed
 reviewed-by: Alex, Edison
2012-02-23 14:11:53 -08:00
frank d9019b3f70 Bug 13962 - CloudRuntimeException: Failed to update keypairs on disk: cannot create key file null/.ssh/id_rsa
Changes for Script.java:
1. Even the script is non-timeout one, set default timeout to one hour. This avoid a wrongn script forever hang
2. When InterruptedException happens, check if timeout is really reached, if not, continue

status 13962: resolved fixed
reviewed-by: Alex, Edison
2012-02-23 13:43:10 -08:00
kishan 9c5fb5f199 Bug 13741: Added new Config category Secure. Any config in secure category will encrypted along with the Hidden category configs
Status 13741: resolved fixed
Reviewed-By: Nitin
2012-02-17 16:42:32 +05:30
Edison Su 1ab89dd436 add cert chain in db, and also open the api to upload a cert chain 2012-02-09 14:56:40 -08:00
kishan 1fab4d1f72 Bug 13384: Added utility to change MS and DB secret key. Both database and db.properties are updated.
Status 13384: resolved fixed
Reviewed-By: Nitin
2012-02-07 20:03:06 +05:30
Alex Huang c42f50c4b0 Used a different way to allocate guest ip address. not in used yet. 2012-01-30 16:10:10 -08:00
frank f449cd7350 Bug 12771 - management-server.log displays ipmi related credentials in plain text
status 12771: resolved fixed
2012-01-09 14:42:01 -08:00
Kelven Yang 323a07d7e2 bug 12709: incremental fix - profiling management server clustering heartbeat activities 2012-01-05 14:59:45 -08:00
Alena Prokharchyk 0731dac370 bug 12399: introduced periodic thread that expires Project invitations
status 12399: resolved fixed
2011-12-09 12:21:41 -08:00
Edison Su 08ae2bc9ff fix loading agent in ssvm 2011-12-07 15:02:57 -08:00
frank 88e4cdc458 Bug 11939 - unify components.xml and components-premium.xml into components.xml
status 11939: resolved fixed
2011-12-07 11:34:57 -08:00
prachi 0769a3b3f3 API Server changes needed to read a properties file present within a jar provided in classpath. 2011-11-29 18:02:19 -08:00
Alena Prokharchyk ecd7004f15 bug 11978: don't allow passing -, + and spaces for instance.name config param
status 11978: resolved fixed
2011-11-28 11:52:46 -08:00
kishan e86b03c2e6 bug 12187 : Handle empty strings while encrypting and decrypting
status 12187 : resolved fixed
reviewed-by: Abhi
2011-11-28 22:20:44 +05:30
Alex Huang 3d6a87867a print out the statement on closing for better debugging output 2011-11-18 14:29:05 -08:00
Sheng Yang 257836284a bug 11904: Fix regression caused by OpenJDK 1.6.0 security fix
It’s due to an security fix of OpenJDK 1.6.0 added by Redhat. Here is excerpt
of [RHSA-2011:1380-01] Critical: java-1.6.0-openjdk security update(
https://www.redhat.com/archives/rhsa-announce/2011-October/msg00011.html)

    A flaw was found in the way the SSL 3 and TLS 1.0 protocols used block
    ciphers in cipher-block chaining (CBC) mode. An attacker able to perform a
    chosen plain text attack against a connection mixing trusted and untrusted
    data could use this flaw to recover portions of the trusted data sent over
    the connection. (CVE-2011-3389)

    Note: This update mitigates the CVE-2011-3389 issue by splitting the first
    application data record byte to a separate SSL/TLS protocol record. This
    mitigation may cause compatibility issues with some SSL/TLS implementations
    and can be disabled using the jsse.enableCBCProtection boolean property.
    This can be done on the command line by appending the flag
    "-Djsse.enableCBCProtection=false" to the java command.

To our knowledge, there are two condition need to be met to trigger this bug:
1.    Using old keystore generated by mgmt. server 2.2.8, which is signed with
SHA1withDSA. Any version later than 2.2.8 would generate keystore signed with
SHA1withRSA. RSA one seems fine with us so far.
2.    Use OpenJDK >=1.6.0.

The reason is, due to the security fix above, the assumption that one packet
would contain only one SSL record is broken. The decrypted data maybe only
contained the first byte of original application data. Then result in buffer
underflow when mgmt server want to read more from it.

To workaround it, according to the message above, add
"-Djsse.enableCBCProtection=false" to tomcat6.conf JAVA_OPTS line would work.
Notice the parameter would only work with latest version of OpenJDK, so simply
add it to the all setup would not work.

This patch provided a fix for it.

status 11904: resolved fixed
2011-11-16 18:40:14 -08:00
Kelven Yang bf4076b559 Fix the problem in retrieving default host IP on windows platform 2011-11-14 11:33:51 -08:00
Alex Huang ddbcd01f56 fixed up unit test 2011-11-11 14:15:13 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
alena a32c4f1ec6 Fixed unit tests 2011-11-03 14:02:53 -07:00
Kelven Yang 924e556c95 bug 6745: Using UUID instead of integers - for all commands 2011-11-03 07:34:00 -07:00
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
kishan 8487803f5a bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values. 2011-10-24 18:02:31 +05:30
Abhinandan Prateek ed2816051a bug 11354: enabled cache for listBy Dao calls and specifically for listBySecurityGroup 2011-10-24 10:50:44 +05:30
kishan 83b4d2f7f9 bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values. 2011-10-24 10:26:02 +05:30
Abhinandan Prateek bd774ab7a7 bug 11354: query cache option is being enabled at DAO level. To use the cache sql paramter query_cache_type should be set to 2 and query_cache_size should be set to a value greated than 40kb. These can be set in my.ini. There are more tuning paramters which can be fine tuned and they are mentioned here http://dev.mysql.com/doc/refman/5.5/en/query-cache-configuration.html 2011-10-20 13:23:14 +05:30
prachi 8570b25506 NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file
Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances.
2011-10-11 17:34:57 -07:00
alena 1c02374708 Fixed the bug in random seq allocator code - always do "+1" because .netxInt(10) method can return 0, and the id in this case will be equal the id already present in the DB. 2011-10-11 12:40:51 +05:30
kishan 7de5153d74 bug 11561: Added new Dao RandomlyIncreasing, which will increase the Vm Id by 1-10 randomly
status 11561: resolved fixed
2011-10-11 12:40:50 +05:30
frank 88b863d6e3 Bug 11522 - New agent manager
Initialize unit test case for resource manager
2011-10-07 15:51:24 -07:00
frank 0f5384d086 Bug 11522 - New agent manager
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
frank 24b82a7a89 Bug 11522 - New agent manager
call SearchCriteriaService interface instead of SearchCriteria2 instance
2011-10-06 10:32:07 -07:00
frank 2b0afe505d Bug 11522 - New agent manager
refine SearchCirteria2
2011-10-05 16:49:47 -07:00
frank 89e04458b6 Bug 11522 - New agent manager
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
2011-10-04 14:35:26 -07:00
Edison Su ae83246acb bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager
status 11600: resolved fixed
2011-10-03 16:43:47 -07:00
frank 683113cc38 Bug 11522 - New agent manager
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -07:00
frank 3947c9a126 Bug 11522 - New agent manager
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
frank e8c13e10c7 Bug 11522 - New agent manager
able to compile besides mycloud stuff
2011-09-26 16:55:20 -07:00
Kelven Yang 2a6de104e2 bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance. 2011-09-22 16:22:12 -07:00
kishan 3dce7ebd03 bug 10782: Add SSL properties in db.properties. Modified JDBC URL to use SSL properties when enabled 2011-09-07 19:52:10 +05:30
Abhinandan Prateek 3c6a0efa29 bug 11181: adding a param so that mysql can cache the listVM prepared statement sql effectively 2011-09-07 05:50:33 +05:30
alena b5b695b82a bug 11262: validate public key before processing it
status 11262: resolved fixed
2011-08-29 11:07:01 -07:00
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -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
Alex Huang 009e60266d fix for the problem of locking connection being gone 2011-08-22 10:08:22 -07:00
Alex Huang 40dac77872 fix for the problem of locking connection being gone 2011-08-22 10:05:37 -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
Alex Huang 6e7ad8830f bug 11043: Propagating fix 2011-08-11 10:30:03 -07:00
Alex Huang 15f86d3d93 bug 11043: rverted the bad fix 2011-08-11 10:25:31 -07:00
alena 6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
Alex Huang a0ea38eb24 Added a method to tell if the inaccurate clock is keeping up with the current time 2011-08-09 10:53:12 -07:00
Alex Huang 5fc13a63b1 There's no background thread working on maintaining the connections 2011-08-09 10:51:13 -07:00
alena 06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -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
Kelven Yang e4a1d491c1 bug 10976: NPE fix to avoid blocking shutdown process 2011-08-05 14:10:15 -07:00
Kelven Yang 9f94a178d6 bug 10976: NPE fix to avoid blocking shutdown process 2011-08-05 14:06:48 -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 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
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
frank 316ed91542 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)
run checker before any component loaded
2011-07-29 20:22:39 -07:00
frank 67265eeaa7 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)
run checker before any component loaded
2011-07-29 20:21:53 -07:00
frank 44f3ac98f6 A couple of things:
add 229 upgrade path

Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)

run checker before any components loaded
2011-07-29 20:05:50 -07:00
Alex Huang 1f4d34b9d5 print further into the stack so we can see who's calling the Transaction methods 2011-07-29 10:51:16 -07:00
frank 9aae53fbb3 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:43:38 -07:00
frank 262e6784e5 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
frank 1381c58fa1 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
Sheng Yang 7a2b0e4946 Update fail-safe keystore with RSA private key 2011-07-25 18:55:16 -07:00
Sheng Yang 7d914666b4 Update fail-safe keystore with RSA private key 2011-07-25 18:55:06 -07:00
Sheng Yang 4775df35ea Update fail-safe keystore with RSA private key 2011-07-25 18:54:32 -07:00
Sheng Yang b116f54741 Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:23:44 -07:00
Sheng Yang 4d20d21c95 Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:23:06 -07:00
Sheng Yang 611a1564cc Generate keystore using RSA rather than DSA
Also fix a typo.
2011-07-25 18:22:30 -07:00
Alex Huang b30c55a53f missing file 2011-07-25 18:07:17 -07:00
Alex Huang 9c627a15f3 Inaccurate clock new gets an mbean to control it 2011-07-25 16:01:31 -07:00
Alex Huang 10ac7753ed Switched ping to use the same db connection so that running out of db connections won't affect basic operations 2011-07-25 10:36:00 -07:00
Alex Huang ec4a46ece3 use in memory counter for locks so we don't do a delete everytime 2011-07-23 15:24:33 -07:00
Alex Huang 69d928b3d1 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 15:03:09 -07:00
Alex Huang 0df4c628a8 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 15:02:33 -07:00
Alex Huang 3f18192df8 Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips 2011-07-23 14:58:32 -07:00
Alex Huang b59c6b4ab6 propagate lock table fix 2011-07-22 11:35:47 -07:00
Alex Huang 44ce9488a6 propagate lock table fixes 2011-07-22 11:30:23 -07:00
Alex Huang 66713a490d fixed problem with the standalone connection has open transaction 2011-07-22 11:25:43 -07:00
Sheng Yang 15bf729927 bug 10714: Implement packet fragmentation
Also add an simple nio unit test.

status 10714: resolved fixed
2011-07-22 10:08:40 -07:00
alena be3683306e bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:49:08 -07:00
alena e344d5f63a bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:48:48 -07:00
alena 39ad35af2c bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)
status 10759: resolved fixed
2011-07-21 18:30:09 -07:00
Alex Huang f500a01511 more db connection controls through jmx 2011-07-21 13:38:53 -07:00
Alex Huang d7667180c5 bug 10816: more db lock controls 2011-07-21 13:38:37 -07:00
Alex Huang 5cfad0b6c9 connection conierge to deal with connections that are not returned to pools 2011-07-21 13:32:43 -07:00
Alex Huang 3ea6948645 bug 10716: Changed transaction level to read committed to allow for more concurrency 2011-07-20 15:54:51 -07:00
Alex Huang 950b53eea9 more db connection controls through jmx 2011-07-19 09:27:09 -07:00
Alex Huang 6a27d11434 more db connection controls through jmx 2011-07-19 09:26:05 -07:00
Alex Huang d54f6d536a propagating transaction isolation fix for merovingian2 2011-07-18 16:48:49 -07:00
Alex Huang 5590cd93ce bug 10716: Changed the connection's isolation level to allow for more concurrency 2011-07-18 16:32:12 -07:00
alena a86f49c106 From Alex - assertion fix 2011-07-18 15:12:44 -07:00
Alex Huang 392c03ce6f propagated db connection savings from master 2011-07-18 14:22:49 -07:00
Alex Huang e52a97b969 Switched ping to use the same db connection so that running out of db connections won't affect basic operations 2011-07-18 14:22:49 -07:00
Alex Huang c097800dae connection conierge to deal with connections that are not returned to pools 2011-07-18 14:22:48 -07:00
Sheng Yang d925aa32e5 bug 10714: Implement packet fragmentation
Also add an simple nio unit test.

status 10714: resolved fixed
2011-07-15 19:35:56 -07:00
Sheng Yang 7f8a0dad31 bug 10714: Implement packet fragmentation
Also add an simple nio unit test.

status 10714: resolved fixed
2011-07-15 19:22:48 -07:00
alena 3d41105e1b From Alex - assertion fix 2011-07-15 10:19:27 -07:00
Alex Huang 161b7f1cad Switched ping to use the same db connection so that running out of db connections won't affect basic operations 2011-07-14 10:48:07 -07:00
alena 1979d1d065 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
status 10681: resolved fixed

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
2011-07-13 18:25:13 -07:00
alena 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
status 10681: resolved fixed
2011-07-13 17:16:07 -07:00
Alex Huang 8ef86467ed more logging and fixed bug in cleanup 2011-07-13 09:53:38 -07:00
Alex Huang b54edececf resolved a bug where the wrong msid was used in releasing locks 2011-07-13 09:52:35 -07:00
Alex Huang 5619f0490c added more locking logging 2011-07-13 09:29:38 -07:00
Sheng Yang 6d3e30f16c Move disconnect log to TRACE level 2011-07-11 11:09:19 -07:00
Sheng Yang a2de0f60d5 Move disconnect log to TRACE level 2011-07-11 11:08:40 -07:00
Sheng Yang 6a23846a8d Fix keystore loading path 2011-07-11 10:59:42 -07:00
Sheng Yang 612f776892 Fix keystore loading path 2011-07-11 10:59:04 -07:00
Sheng Yang ccc12793c6 SSL: Fix leaking file descriptor
And bad connection fail handling.
2011-07-08 22:17:09 -07:00
Sheng Yang e8f317243f SSL: Fix leaking file descriptor
And bad connection fail handling.
2011-07-08 22:04:34 -07:00
Sheng Yang 0f09546d04 Fix Class cast issue 2011-07-08 20:34:12 -07:00
Sheng Yang 8ada2852bf Suppress connection error messages
Load balancers would trigger this error message again and again.. Put them in to
debug/trace level, instread of showing a calltrace.
2011-07-08 18:12:29 -07:00
Alex Huang 5b122e3669 connection conierge to deal with connections that are not returned to pools 2011-07-08 18:04:57 -07:00
Alex Huang ea48d40e5f connection conierge to deal with connections that are not returned to pools 2011-07-08 18:04:57 -07:00
Alex Huang ee2670edc7 Some operations on the lock table allowed through jmx 2011-07-06 16:10:18 -07:00
Alex Huang 7e9836dfd0 Some operations on the lock table allowed through jmx 2011-07-06 16:09:05 -07:00
Alex Huang cabba35280 bug 10548: This problem is actually still a running out of db connection problem. However, it points out a weakness in the Merovingian2 design. It should keep a database connection for itself. I originally intended to have that after writing the first edition but got distracted and didn't finish. Here in the new implementation, Merovingian2 allocates a database connection for itself and keeps it alive at 10 second intervals with a SELECT 1 to avoid the connection being considered as abandoned by the dbcp pool. 2011-07-03 19:17:05 -07:00
Alex Huang b45bc9449e bug 10548: This problem is actually still a running out of db connection problem. However, it points out a weakness in the Merovingian2 design. It should keep a database connection for itself. I originally intended to have that after writing the first edition but got distracted and didn't finish. Here in the new implementation, Merovingian2 allocates a database connection for itself and keeps it alive at 10 second intervals with a SELECT 1 to avoid the connection being considered as abandoned by the dbcp pool. 2011-07-03 19:16:24 -07:00
Alex Huang f28a2b40a3 bug 10501: This is really Kelven's bug but I'll fix it for him anyways. DAO code already have a way to extract the DB connection from a transaction that is stored in the TLS. There's no real reason for the DAO code to add special semantics to use a different DB connection. That can be done by simply switching the transaction before it even reached the dao code. Think about it. Why would anyone want to call one dao function, switch transaction, and then switch back. The right thing is for the caller to switch transaction, call a series of dao codes, and switch it back. That's the semantics I changed to. By doing this, it also eliminates the number of debug messages in this bug. 2011-07-01 11:03:37 -07:00
Alex Huang cfc25d01be bug 10501: This is really Kelven's bug but I'll fix it for him anyways. DAO code already have a way to extract the DB connection from a transaction that is stored in the TLS. There's no real reason for the DAO code to add special semantics to use a different DB connection. That can be done by simply switching the transaction before it even reached the dao code. Think about it. Why would anyone want to call one dao function, switch transaction, and then switch back. The right thing is for the caller to switch transaction, call a series of dao codes, and switch it back. That's the semantics I changed to. By doing this, it also eliminates the number of debug messages in this bug. 2011-07-01 11:03:12 -07:00
Alex Huang 43252dd4de bug 10322: Transaction is using the new Merovingian 2011-06-29 15:34:54 -07:00
Alex Huang 7a4af21f72 bug 10322: Transaction is using the new Merovingian 2011-06-29 15:34:53 -07:00
Alex Huang d5b3fe4e35 bug 10322: Transaction is using the new Merovingian 2011-06-29 15:15:52 -07:00
Alex Huang 81213c2be2 bug 10322: Transaction is using the new Merovingian 2011-06-29 12:35:30 -07:00
Alex Huang fefc798197 bug 10322: better mannered merovingians 2011-06-29 12:03:22 -07:00
Alex Huang 687e9f6e67 bug 10322: arrival of the next generation Merovingians 2011-06-29 12:03:05 -07:00
Alex Huang 27809e651e bug 10322: arrival of the next generation Merovingians 2011-06-29 12:02:53 -07:00
Alex Huang e16a013335 bug 10322: better mannered merovingians 2011-06-29 12:01:43 -07:00
Alex Huang 2219269e83 bug 10322: arrival of the next generation Merovingians 2011-06-29 12:01:43 -07:00
Alex Huang cbee5a6044 bug 10322: arrival of the next generation Merovingians 2011-06-29 12:01:43 -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
Alex Huang dc44a4fe6e more jmx stuff 2011-06-28 01:17:48 -07:00
Alex Huang 8903801193 more jmx stuff 2011-06-28 01:17:48 -07:00
Alex Huang 89269069f9 Added JMX to Transaction 2011-06-28 01:17:46 -07:00
Alex Huang 2f391d2b9d more jmx stuff 2011-06-28 01:17:10 -07:00
Alex Huang 90488eea7c more jmx stuff 2011-06-27 18:26:30 -07:00
Alex Huang b7e4298c94 Added JMX to Transaction 2011-06-27 17:24:26 -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
Kelven Yang 3da61e7c27 bug 9605: use CIDR from default interface 2011-06-23 17:47:20 -07:00
Kelven Yang 3b93d353d6 bug 9605: use CIDR from default interface 2011-06-23 17:48:37 -07:00
Alex Huang f360576391 bug 10375: fixed a problem with build name 2011-06-22 16:47:52 -07:00
Alex Huang 05a2fb6957 faster implementation of the log renderer 2011-06-22 16:47:51 -07:00
Alex Huang a963b477ee build better names 2011-06-22 16:47:51 -07:00
Alex Huang 251552f679 propagate loggin fixes 2011-06-22 16:36:24 -07:00
Sheng Yang ba6dd6cfcd Catch more exception 2011-06-22 14:45:54 -07:00
Sheng Yang 345d747913 Add more _selector.close()
Also add more log.
2011-06-22 14:23:41 -07:00
Alex Huang ecd9fad89c bug 10375: fixed a problem with build name 2011-06-22 16:43:53 -07:00
Alex Huang 129f40d0cb bug 10375: trying to reduce the scope of the transaction 2011-06-22 16:34:14 -07:00
Alex Huang 252ca3f81a build better names 2011-06-22 16:34:14 -07:00
Alex Huang 47f114ad96 faster implementation of the log renderer 2011-06-22 16:34:14 -07:00
Sheng Yang cba8e16b61 Catch more exception 2011-06-22 14:46:15 -07:00
Sheng Yang 64b2293a50 Add more _selector.close()
Also add more log.
2011-06-22 14:24:12 -07:00
Alex Huang 38ebac207b bug 10375: Added logging for exception causes 2011-06-22 11:51:54 -07:00
Alex Huang 573c054673 bug 10375: Added logging for exception causes 2011-06-22 11:51:35 -07:00
Alex Huang a698dbe513 some connection logging was missing 2011-06-21 14:43:31 -07:00
Alex Huang 0cf9d8b788 some connection logging was missing 2011-06-21 14:42:12 -07:00
Alex Huang 22d5eac400 new log4j 2011-06-21 10:15:21 -07:00
Alex Huang 9d1523e6d6 faster checks in the logging. Also better description 2011-06-21 09:56:01 -07:00
Alex Huang 5771b35a7a new log4j jar files and now the ability to get rid of the stupid cglib stack traces in our logs 2011-06-21 01:12:06 -07:00
Sheng Yang 6eb9c428bb SSL: Fix loop in when BUFFER_UNDERFLOW
Add 10 times as limit, as well as add the missing count=-1 judgement.
2011-06-20 18:38:14 -07:00
Sheng Yang da0379149a SSL: Fix loop in when BUFFER_UNDERFLOW
Add 10 times as limit, as well as add the missing count=-1 judgement.
2011-06-20 18:36:35 -07:00
Alex Huang 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
Alex Huang 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
Alex Huang 87573cad52 added connection logging to check for db connection losses 2011-06-19 06:31:56 -07:00
Alex Huang c9a58ba36e added connection logging to check for db connection losses 2011-06-19 06:31:33 -07:00
Alex Huang 63113661d1 bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:33:09 -07:00
Alex Huang d39048faca bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:33:09 -07:00
Alex Huang 5df1aa02f4 bug 10094: distinguish between no transition from one state to another vs there's a concurrent operation 2011-06-13 17:33:09 -07:00
Alex Huang 1561275838 bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:35:34 -07:00
Alex Huang 1d7e70acd1 bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:35:20 -07:00
Alex Huang f93612df37 bug 10094: distinguish between no transition from one state to another vs there's a concurrent operation 2011-06-13 17:33:51 -07:00
Alex Huang 283a559f03 Changed disconnection messages to be logged at debug level because there's been various reports that agents are dropping connections. This should help in figuring it out. 2011-06-13 11:40:04 -07:00
Alex Huang 2a9dc74645 Changed disconnection messages to be logged at debug level because there's been various reports that agents are dropping connections. This should help in figuring it out. 2011-06-13 11:39:39 -07:00
Alex Huang c62643536a Added new search 2011-06-12 06:04:27 -07:00
alena ef3ea765bf bug 9697: encode api response values
status 9697: resolved fixed

Do encoding for ASCII chars only (done to eliminate problems with multiple language support)
To disable encoding, set "encode.api.response" to false
2011-06-10 18:10:44 -07:00
alena cd7c74538b bug 9697: encode api response values
status 9697: resolved fixed

Do encoding for ASCII chars only (done to eliminate problems with multiple language support)
To disable encoding, set "encode.api.response" to false
2011-06-10 17:45:15 -07:00
Alex Huang 9c72759007 bug 9651: update network working now 2011-06-09 11:54:47 -07:00
Alex Huang b07835c557 bug 9651: update network working now 2011-06-09 11:54:12 -07:00
Alex Huang b1de7ece25 bug 9651: we're saving the tags twice. 2011-06-08 15:55:37 -07:00
Alex Huang 575ac62926 bug 9651: propagating 3fd50fd8634958727f4c64c9d1fb7fa27e07e4c8 2011-06-08 15:58:01 -07:00
Sheng Yang ff86c865e2 bug 10135: Add SSL encryption for non-NIO link
Now Link.write() support SSL encryption. And since there is no user of
Link.read(), we comment it out.
2011-06-04 21:27:18 -07:00
Alex Huang d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
Alex Huang 2dbb8eb502 bug 9651: Make same VLAN work on two different nics 2011-06-01 17:07:44 -07:00
Alex Huang 8754f8fab8 bug 9651: checked in missing files 2011-05-31 10:27:50 -07:00
Alex Huang 7c74c3a51d bug 9651: network tagging changes working now 2011-05-31 09:49:27 -07:00
Alex Huang 0ab12edd6c network tagging changes 2011-05-31 09:49:27 -07:00
Alex Huang 67ff27496d tags added 2011-05-31 09:48:34 -07:00
Alex Huang 0dfc44582b bug 9651: Adding network tags
Also changes in Request logging.
2011-05-23 15:51:50 -07:00