Commit Graph

379 Commits

Author SHA1 Message Date
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