etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,441 Commits 323 Branches 325 Tags 976 MiB
Commit Graph

361 Commits

Author SHA1 Message Date
Rohit Yadav aada8fe1d5 CLOUDSTACK-8372: Encrypt key column when saving key in keystore table 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6c5cf04d62)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-04-08 14:37:14 +05:30
Rohit Yadav 6c5cf04d62 CLOUDSTACK-8372: Encrypt key column when saving key in keystore table 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-04-08 14:35:17 +05:30
Jayapal 2f1863cae0 Avoid logging password when adding srx device 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a1cc43fee2876463c2ca65e9e9d7e81be48a136e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-13 15:02:27 +05:30
Jayapal 32fe64ce1b Avoid logging password when adding srx device 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-13 15:01:06 +05:30
Rohit Yadav 74f9adbe3e engine: Add Upgrade path from 4.5.0 to 4.5.1 
Encrypts:
- Remote access vpn preshared key
- StoragePool's user info
- Keystore's key

This closes #112

(cherry picked from commit cfd4573335)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
 2015-03-12 13:02:45 +05:30
Rohit Yadav cfd4573335 engine: Add Upgrade path from 4.5.0 to 4.5.1 
Encrypts:
- Remote access vpn preshared key
- StoragePool's user info
- Keystore's key

This closes #112

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-12 12:13:28 +05:30
Rohit Yadav c198dfdb7a Update pom and version usage to 4.5.1-SNAPSHOT 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-12 12:13:18 +05:30
Rohit Yadav 68b5440d44 fix NPE cases, throw exceptions early on 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 17:44:32 +05:30
Rohit Yadav 46cd98b163 jobs: fix corner cases, add NPE checks 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:20:47 +05:30
Rohit Yadav 0afec010b8 jobs: fix corner cases, add NPE checks 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:20:08 +05:30
Santhosh Edukulla bd190192b9 Fixed Resource Leaks 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 350ac4c4b0)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
 2015-02-05 13:47:22 +05:30
Santhosh Edukulla 737edd90dc Fixed few coverity patches 
NPE in delete firewall rules observed, cherry-picking fix from master.

(cherry picked from commit 31a42d2b7a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 12:48:38 +05:30
Rohit Yadav bf88be5b25 Revert "CLOUDSTACK-8011: Upgrade maven dependencies" 
This reverts commit 482815d084.
 2014-12-04 19:47:23 +05:30
Rohit Yadav 835abe6c7c Revert "CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable." 
This reverts commit 6df38427cf.
 2014-12-04 02:38:47 +05:30
Rohit Yadav 482815d084 CLOUDSTACK-8011: Upgrade maven dependencies 
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fac7bfc5d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	pom.xml
 2014-12-04 02:14:54 +05:30
Rohit Yadav fac7bfc5d5 CLOUDSTACK-8011: Upgrade maven dependencies 
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-04 02:12:51 +05:30
Rajani Karuturi b6c86bdb75 changed commons-io version to the latest stable 2.4 
also updated version numbers in all the poms its used.
 2014-11-28 17:01:16 +05:30
Laszlo Hornyak 3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Edison Su d856a2acad CLOUDSTACK-7946: 
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
 2014-11-19 16:08:27 -08:00
Edison Su 67113ff0b2 CLOUDSTACK-7946: 
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
 2014-11-19 16:06:37 -08:00
Min Chen 6df38427cf CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is unusable. 
(cherry picked from commit a2d85c8cae)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
 2014-11-12 21:28:31 +05:30
Min Chen 0c45c96ec7 CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to start because of a management server restart. Added optimization to purge queue items for cancelled jobs. 2014-11-11 11:11:18 -08:00
Min Chen 213088d7da CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to start because of a management server restart. Added optimization to purge queue items for cancelled jobs. 2014-11-11 10:55:20 -08:00
Min Chen f2cedda9ef CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after some restart. 2014-11-11 09:19:21 -08:00
Min Chen 2ef06e754b CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after some restart. 2014-11-11 09:06:36 -08:00
Damodar cdabb2407a CLOUDSTACK-7843: sync Job Failures always reported as success on Event Bus 2014-11-10 15:07:13 +05:30
Damodar ca66062cd5 CLOUDSTACK-7843: sync Job Failures always reported as success on Event Bus 2014-11-10 14:33:28 +05:30
Min Chen 3a2f6ffd49 CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to start because of a management server restart. 2014-11-07 16:37:05 -08:00
Min Chen a275bd7ca4 CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to start because of a management server restart. 2014-11-07 16:36:05 -08:00
Min Chen 392eaf3e56 Revert "BUG-ID: CS-27191: CPVM continues to be in Stopped state after a failure" 
This reverts commit d065bcf9b4.
 2014-11-07 16:33:45 -08:00
Min Chen d065bcf9b4 BUG-ID: CS-27191: CPVM continues to be in Stopped state after a failure 
to start because of a management server restart. Reviewed-by:
Anthony
 2014-11-07 15:37:00 -08:00
Rajani Karuturi 4c5f792ca9 Merge branch '4.5' 2014-11-05 15:20:34 +05:30
Rajani Karuturi c3e5964dcb Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work 
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35
 2014-11-05 11:49:38 +05:30
Min Chen 07ba078ee6 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 11:19:06 -08:00
Min Chen 6830cbc15a CLOUDSTACK-7832: Move some job db update and item purge to 
completeAsyncJob transaction to avoid MySQL deadlock.
 2014-11-03 11:18:52 -08:00
Min Chen 684889f0b5 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 10:52:47 -08:00
Min Chen ffaabdc13f CLOUDSTACK-7832: Move some job db update and item purge to 
completeAsyncJob transaction to avoid MySQL deadlock.
 2014-11-03 10:41:36 -08:00
Hugo Trippaers a265d7b505 Fix a bug that prevented me from starting CS. 
No idea why this error suddenly pops up, this is old (but wrong) code.
 2014-10-29 16:59:00 +01:00
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Min Chen dbf12d58e7 CLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that have been blocking for too long if exception is thrown in expunging some unfinished or completed old jobs, this will make some future jobs stuck. 2014-10-17 10:55:38 -07:00
Min Chen 248e4fbdac CLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that have been blocking for too long if exception is thrown in expunging some unfinished or completed old jobs, this will make some future jobs stuck. 2014-10-17 10:43:59 -07:00
Santhosh Edukulla 0a9742f914 Fixed few coverity issues 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-14 17:16:50 +05:30
Santhosh Edukulla 350ac4c4b0 Fixed Resource Leaks 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-13 17:51:02 +05:30
Hugo Trippaers dba4a8c837 cleaning more conflicts 2014-10-13 00:19:20 -04:00
Min Chen 3ebf49ab28 CLOUDSTACK-7628:VM Worker job should be expunged one hour after 
completion instead of currently being expunged whenever cleanup task
thread is run.
(cherry picked from commit 4317a85e97)
 2014-10-12 23:53:56 -04:00
Anthony Xu d036168ecb cleaning up more conflicts 2014-10-12 23:52:53 -04:00
Anthony Xu b4bddc61ac timeInSeconds * 1000 
timeInSeconds is int type, if timeInSeconds is very big, it makes "timeInseconds * 1000" very small even 0

(cherry picked from commit f5eae55abb)
 2014-10-12 23:48:43 -04:00
Koushik Das 1b0618d39c CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
 2014-10-12 23:43:01 -04:00
Min Chen b979c6f0c7 CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after 
management server restarts.

(cherry picked from commit 7cdb67dcf1)
 2014-10-12 23:40:07 -04:00
Santhosh Edukulla 31a42d2b7a Fixed few coverity patches 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-09 11:45:26 +05:30
Hugo Trippaers fe325ab576 CLOUDSTACK-7624 The value field of the configuration table is not big enough for some values 
(cherry picked from commit 9eb86560c9)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-10-02 09:58:45 +02:00
Min Chen 4317a85e97 CLOUDSTACK-7628:VM Worker job should be expunged one hour after 
completion instead of currently being expunged whenever cleanup task
thread is run.
 2014-09-24 17:27:39 -07:00
Anthony Xu f5eae55abb timeInSeconds * 1000 
timeInSeconds is int type, if timeInSeconds is very big, it makes "timeInseconds * 1000" very small even 0
 2014-09-24 10:57:36 -07:00
Anthony Xu c74dada854 add logs for lock acquire and release 2014-09-24 10:28:04 -07:00
Hugo Trippaers 2503aaafef Revert "removed unused class" 
This reverts commit 093fa6f0a5.
 2014-09-24 08:41:55 +02:00
Anthony Xu d8ad3e32bc throw timeout exception when lock acquire times out 2014-09-23 18:01:32 -07:00
Anthony Xu 093fa6f0a5 removed unused class 
ramework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
 2014-09-23 16:48:14 -07:00
Koushik Das a6ee4112a5 CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required
 2014-09-22 16:45:37 +05:30
Min Chen 7cdb67dcf1 CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after 
management server restarts.
 2014-09-19 15:12:31 -07:00
Anthony Xu e5a91e40dd in tagCommand, AsyncJobExecutionContext doesn't need to be created if it doesn't exist 2014-09-17 18:15:41 -07:00
Min Chen a2d85c8cae CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is 
unusable.
 2014-09-16 15:14:08 -07:00
Harikrishna Patnala 5d389b1a71 CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-09-05 14:59:33 +05:30
Hugo Trippaers dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Santhosh Edukulla 4a6560a9ee Fixed few coverity defects 2014-08-21 12:43:11 +05:30
Anthony Xu 90fe6d8087 removed trailing space 2014-08-13 11:09:38 -07:00
Santhosh Edukulla 0ca3b4a4e4 Fixed coverity reported concurrency issue 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-08-06 10:15:39 +05:30
Alena Prokharchyk ffeca8bbd2 CLOUDSTACK-7209: handle the case when network fails to implement NoTransitionException, and null is returned to the caller stack. All caller methods should verify if the return value is null before processing it further. 2014-08-01 09:47:28 -07:00
Min Chen 3b32732459 CLOUDSTACK-7162:queryAsyncJobResult api does not return jobinstanceid. 2014-07-22 09:47:59 -07:00
Nitin Mehta 77dadd75c4 CLOUDSTACK-6787: Publishing uuids missing in some cases, adding/correcting events in some cases. 
Also fixed a bug in the global config framework.
 2014-07-21 14:08:18 -07:00
Kishan Kavala b8ddbe8ffa CLOUDSTACK-6239: Encrypt security related config values before inserting into DB 2014-07-21 14:49:07 +05:30
Koushik Das aacf8ef77b Findbugs fixes in cloud-utils project and a few other places 2014-07-15 14:23:17 +05:30
Anthony Xu 388210c8f9 Add more logs for MS cluster manager 2014-07-11 17:39:40 -07:00
Santhosh Edukulla 1f3d02b38a Reverting the changes done to this file for coverity fixes 2014-07-10 23:35:27 +05:30
Koushik Das 61fe959bb4 Removed invalid assertions from code. Now the MS can be run with assertions enabled (using -ea flag) 2014-07-10 12:18:29 +05:30
Santhosh Edukulla d51e8f44ae CLOUDSTACK-7079: Fixed the issue where rollback was called after commit. As well, added few null checks 2014-07-09 15:58:43 +05:30
Likitha Shetty 4f969057b2 CLOUDSTACK-7030. After the restart of MS in a clustered MS pool, not all hung worker VMs are recycled. 
Recycle worker VMs that originally belonged to other management servers too because in case of MS restart, the owner MS might change.
 2014-07-07 13:38:47 +05:30
Santhosh Edukulla a600d8408e Fixed Resource Leaks, null dereferences, few other issues reported by coverity 2014-07-04 16:17:58 +05:30
Santhosh Edukulla b2283d7a28 Fixed few resource leaks and added secstoragefirewallcfg command support to simulator 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-24 23:19:47 +02:00
Santhosh Edukulla 1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-21 12:38:46 +02:00
Hugo Trippaers 0c28f36ff1 Fix a number of resource leaks reported by Coverity 2014-06-13 14:42:35 +02:00
Min Chen 25580c7cd1 CLOUDSTACK-6859:Management Server PermGen run out of memory after some 
time due to class leak.
 2014-06-06 23:57:26 -07:00
Marcus Sorensen 20a31b43d6 CLOUDSTACK-6784: Expose data types via API so consumers of API can validate data 2014-05-27 15:23:23 -06:00
Marcus Sorensen 2a5bf65c78 CLOUDSTACK-6785: Allow async jobs to supply an injectedjobid 2014-05-27 15:23:02 -06:00
Min Chen ba848087f8 Disable IAM feature from 4.4 release. 2014-05-22 18:27:08 -07:00
Kelven Yang 09ec127470 CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin 2014-05-21 16:17:39 -07:00
Murali Reddy 6f2a193b7c CLOUDSTACK-6720: Async job events are not published on event bus 
fix ensures publishOnEventBus() is called on submit, update, complete
phase of job procesing
 2014-05-20 17:13:58 +05:30
Kelven Yang 521ac796dd Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server. 2014-05-06 15:48:22 -07:00
Nitin Mehta 1d45b75298 CLOUDSTACK-6499: 
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
 2014-04-24 17:27:02 -07:00
Min Chen da13165743 Change AccountManagerImpl.checkAccess to invoke SecurityChecker 
interface that takes multiple controlled entities.
 2014-04-17 17:53:01 -07:00
Ding Yuan c031eb7d38 CLOUDSTACK-6242: exception handling improvements 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-04-15 08:07:15 +02:00
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
Kelven Yang b6cc6dd8e3 CLOUDSTACK-6305: protect lock leaking from unhandled exception 2014-03-28 15:30:07 -07:00
Laszlo Hornyak 54c83c168f removed redundant Integer instantiation in GenericDaoBase 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-28 18:40:25 +01: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