57 Commits

Author SHA1 Message Date
Kelven Yang
cd8801f6f7 Do app-level iteration to avoid mysql deadlocks 2014-04-02 15:46:50 -07:00
Kelven Yang
66486d4322 BUG-ID: CS-19697: Deal with possible DB deadlock issue, return the job into queue for next turn 2014-04-02 14:59:04 -07:00
Daan Hoogland
8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Kelven Yang
ec01791936 Fix the missing java imports from automatic merge 2014-03-14 14:22:23 -07:00
Kelven Yang
12f7cbcb76 Deal with concurrent state update for VM and Host objects. 2014-03-14 14:07:39 -07:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Kelven Yang
5310e66f30 Do not use row lock in sync-queue scheduling to work around mysql locking issues. 2014-03-13 16:59:56 -07:00
Kelven Yang
8e27120be4 Seperate job executor pools to avoid thread starvation situation. 2014-03-13 16:59:56 -07:00
Alena Prokharchyk
90c485e5d6 Fixed some problems reported by FindBugs 2014-03-13 13:45:30 -07:00
Kelven Yang
5dd4fb22ef Remove cancelled jobs from job monitoring, correct mis-calculated time-unit in job cancellation. 2014-03-03 17:44:58 -08:00
Kelven Yang
b21662f890 make sure XS report VM state even if there is no running VM on the host. 2014-02-28 15:35:59 -08:00
Kelven Yang
537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang
a8c9238d3d CLOUDSTACK-6065: Fix NPE problem caused by the lack of context setup in threads from agent manager thread pool 2014-02-28 15:35:59 -08:00
Kelven Yang
441be43b8c CLOUDSTACK-5358: Bring back concurrency control in sync-queue management 2014-02-28 15:35:57 -08:00
Kelven Yang
a9733b5df2 CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations 2014-01-17 11:55:14 -08:00
Kelven Yang
14e399410b CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes 2014-01-15 16:22:27 -08:00
Kelven Yang
a05d71a80c CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow 2014-01-09 14:29:13 -08:00
Kelven Yang
87381d4236 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-09 14:29:12 -08:00
Kelven Yang
69f49839d3 CLOUDSTACK-5726: Using runtime discovered dao (in AsyncJobManagerImpl.submitAsyncJob) to persist record has a problem to locate the right DAO instance, it causes corrupted field value be stored in database. Put in a work-around fix first to always initialize record fields in all cases 2014-01-09 14:29:12 -08:00
Kelven Yang
832c8e4728 CLOUDSTACK-5669: Always retrieve the most recent job result in OutComeImpl 2014-01-09 14:29:12 -08:00
Kelven Yang
bf9a554522 CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Kelven Yang
3c965d0685 CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations 2013-12-18 16:14:07 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Kelven Yang
26c1ba296c CLOUDSTACK-669: put user vm work under new vmsync model 2013-12-11 16:29:59 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Kelven Yang
278ef81a83 side-by-side VM sync management at manager level 2013-11-20 17:59:38 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Kelven Yang
191dc80fa4 VM power state for job oritented sync processing 2013-11-05 19:00:37 -08:00
Darren Shepherd
1460196496 Centralize loading of db.properties to one place
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07:00
Laszlo Hornyak
dbaa818d1e InputStream use fix
Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00
Darren Shepherd
e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd
f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Darren Shepherd
67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Darren Shepherd
aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Alex Huang
a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang
3e813ce61d Committing review 13891. 2013-09-23 14:59:58 -07:00
Alex Huang
8f556e6d88 Made changes to configuration. Eliminated ConfigValue and only use ConfigKey 2013-09-06 15:40:38 -07:00
Alex Huang
435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Alex Huang
1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Chip Childers
0365d555cf Adding a name to the framework/jobs/pom.xml file
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-20 19:17:33 +01:00
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30