apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,274 Commits 307 Branches 324 Tags
Commit Graph

1435 Commits

Author SHA1 Message Date
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
Sanjay Tripathi
5aedeb74f9 CLOUDSTACK-8312: The storage usage of "Primary Storage Allocated" is incorrect. 
(cherry picked from commit 520d96724ac437aa0a9ed391066f4f0879eaef7e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-11 13:07:47 +05:30
Rohit Yadav
b879916f5c CLOUDSTACK-7639: make cidr updation more efficient 
check and update only when required

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 16:29:05 +05:30
Rohit Yadav
b2b9de7fa3 CLOUDSTACK-7639: make cidrlist update when updateNetworkAclItem is called 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 15:40:32 +05:30
Rohit Yadav
5481485a08 CLOUDSTACK-5238: password checks, NPE fixes and minor fixes 
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 18:20:10 +05:30
Daan Hoogland
8ad2e309a4 CLOUDSTACK-8238 handling of retry ping improved 
Fixed on 4.4 and master but not on 4.5, cherry-picked on 4.5 using commit
fbafc957dc4e9cdc83aceb2762c0b07296b1a3e6

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

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
 2015-02-16 11:35:41 +05:30
Rohit Yadav
8cfd374f04 CLOUDSTACK-8224: Don't try to unlock if template is not locked 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 17:43:12 +05:30
Santhosh Edukulla
78bfaa79cf Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 
(cherry picked from commit ef6ec7b27675ea44d45c68b30eb2f508655703be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:50:20 +05:30
Nitin Mehta
4ea0dcda9b CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented 
(cherry picked from commit a8b89bea4f37a54267694b9a49be6b5bec91f0b0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 16:24:06 +05:30
Hugo Trippaers
82eebab0ba CID-1241966 Fix potential null deref 
(cherry picked from commit 1c94017ff693fbff51553d0095aef4d9e0552098)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 18:27:09 +05:30
Rohit Yadav
a4d24adfb8 CLOUDSTACK-8146: close search builder using done() 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 18:05:25 +05:30
Kishan Kavala
ca0a77088c Close transaction while fetching recent events 
(cherry picked from commit 438f90a2627c4a7408f02fc4b59be7eb566443be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:56:20 +05:30
Rohit Yadav
fb1069ace9 agent: don't investigate if host is null, send alert instead 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:42:56 +05:30
Rohit Yadav
419508b016 orchestration: allow storage migration 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a2547ed827c5fbb7d43181c8d3f84b81ffbeeeda)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:39:17 +05:30
Kishan Kavala
7a397cd4ef For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface 
(cherry picked from commit 9eb8d538dd196f27e5194dd2e657afffdb9347eb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:37:59 +05:30
Rohit Yadav
e40b06e9ca AgentAttache: allow checkonhost command in maintenance, cancel if only allowed 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 16:29:44 +05:30
Santhosh Edukulla
c25263ba81 Fixed Coverity Issues 2015-02-05 15:59:29 +05:30
Likitha Shetty
7de7885a54 CLOUDSTACK-8125. VM fails to start on the first attempt after a cold migration. 
Update volume chain_info to NULL during cold migration.
Otherwise during VM start, CCP will configure and try to power-on the VM with wrong disk information.

(cherry picked from commit 7b32b8a26808a546d1dbfdf4728c6228a41852b6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:30:49 +05:30
Damodar
01cc1b816d CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine 
(cherry picked from commit 781648fb1003c8c32875e9ff7a6c4ef4694539f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 2015-02-05 15:22:21 +05:30
Damodar
8ec6d0471c CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 
(cherry picked from commit 50185b7c3a1fd26e9a8635c28cee70fda32d3fc5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2015-02-05 14:56:52 +05:30
Devdeep Singh
0e4d91aa91 CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage 
pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user.

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

Conflicts:
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
 2015-02-02 14:36:07 +05:30
Likitha Shetty
f00140243c CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true. 
During VM creation, if vm.instancename.flag is set to true and hypervisor type is VMware, check if VM with the same hostname already exists in the zone.

(cherry picked from commit 5f9e4fddf303f312a0b17abc0d837f28042caeda)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 14:30:18 +05:30
Kishan Kavala
0c1172ffe9 Network offering usage event should be logged for UserVms only 
(cherry picked from commit 42cecbb000416978a7edcef5d8c664dac4b52277)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 14:27:24 +05:30
Likitha Shetty
294f5bf331 CLOUDSTACK-8114. Ensure VM stop and then start updates the volume path correctly in the DB. 
(cherry picked from commit 521258bafb91e30d7bd43fba62cc47a77c078028)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 14:27:04 +05:30
Likitha Shetty
b9932a0129 CLOUDSTACK-8122. Handle NPE thrown during migration failures. 
When migration fails instead of returning NULL, throw the exception.

(cherry picked from commit a5a65c7b551ee5cc32588997937267b716eff681)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 13:56:43 +05:30
Likitha Shetty
bcbfe3bdee CLOUDSTACK-8129. Cold migration of VM across VMware DCs leaves the VM behind in the source host. 
If VM has been cold migrated across different VMware DCs, then unregister the VM from source host.

(cherry picked from commit 15b348632df2049347f58c87830be2c02eee3b61)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 13:51:47 +05:30
Likitha Shetty
45d32234a6 CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true. 
Before registering a VM check if a different CS VM with same name exists in vCenter.

(cherry picked from commit 33179cce56b15f0632e38afa260cb829bb2a2273)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 13:51: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 31a42d2b7a5a9d3dbf10dc680d7e8877ed4e40c6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-02 12:48:38 +05:30
Wei Zhou
e9ce0df5d8 CLOUDSTACK-7316: usage server cannot start due to missing key in /etc/cloudstack/usage/ in Ubuntu setup 
(cherry picked from commit 6fb9746e5eeacadc10b7d0977b03959683058b33)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-27 17:39:22 +05:30
Daan Hoogland
e474454c91 CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:57:46 +01:00
Rohit Yadav
debfcdef78 CLOUDSTACK-8160: use preferable protocols 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-21 18:02:58 +05:30
Harikrishna Patnala
9cf05dc842 CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false 
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration

(cherry picked from commit c55bc0b2d11be4820a24af426e23da3db54a0cb1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 14:43:10 +05:30
Bharat Kumar
bf8db0c743 CLOUDSTACK-7571 changing value of cpu/mem.overprovisioning.factor for xen cluster is not affecting total memory at zone level 
(cherry picked from commit 476733cb92634c8494fe64762d7fbc178292a754)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 14:39:21 +05:30
Saksham Srivastava
45108fdbad CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly 
(cherry picked from commit fc4dceaa991ecacf0d248725decd5370622ea0ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 14:38:03 +05:30
Rohit Yadav
4e01d61f87 engine: remove redundant import 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 11:45:34 +05:30
Min Chen
ff70ef797c CLOUDSTACK-8101: volume sync not working as expected - MS restart during upload volume leaves volume in hung state. 
(cherry picked from commit e559b15b6a166e2eb5f9b044338295fe8c9d219d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 2015-01-20 11:43:36 +05:30
Nitin Mehta
1aeaf4dcc9 CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to not connect, fix it and also make sure that template/volume sync are robust that exceptions do not cause ssvm agent disconnect issues. 
(cherry picked from commit 5213401ace08f4a5247a325e9d99a4a66bd7df11)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 2015-01-20 11:39:34 +05:30
Sanjay Tripathi
8790b84b20 CLOUDSTACK-7940: Exception printed completely on the UI. Not in a readable format. 
(cherry picked from commit dda29949366f16c06445dde9161c3b1151ed3f36)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 11:34:48 +05:30
Abhinandan Prateek
a1a601be5a CLOUDSTACK-8164: Look for all host to avoid NPE 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-19 11:29:51 +05:30
Likitha Shetty
fd0eb6c29e CLOUDSTACK-3439. [VMWARE] While preparing for migration, include dynamically created nics in case of VMware too. 
(cherry picked from commit 4b67a48144402a3a43d51c869456d9268873b1b1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 18:19:30 +05:30
Kishan Kavala
1e87f3b80b Bug-Id: CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM 
(cherry picked from commit f767adfe71dda82c45cf376ba71518e2ad84cc98)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 18:19:24 +05:30
Sanjay Tripathi
466e6d15a4 CLOUDSTACK-8097: Failed to create volume snapshot after vm live migration across clusters. 
(cherry picked from commit 0c4128e024b519f24625ad8cd6b53ddf0137728e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:59:31 +05:30
Likitha Shetty
d807bf0a4e CLOUDSTACK-8107. Failed to create snapshot from volume when the task is performed repeatedly in zone wide primary Storage. 
While taking a snapshot of a volume, CS chooses the endpoint to perform backup snapshot operation by selecting any host that has the storage containing the volume mounted on it.
Instead, if the volume is attached to a VM, the endpoint chosen by CS should be the host that contains the VM.

(cherry picked from commit a75a43137316a60b20760aa5015d97f55520fd16)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:51:19 +05:30
Saksham Srivastava
a1791cb4a8 CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException 
(cherry picked from commit 1df0453d27e8378065c15878067fc9d2dc961e30)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:28:17 +05:30
Sanjay Tripathi
8676ff26e0 CLOUDSTACK-8066: There is not way to know the size of the snapshot created. 
(cherry picked from commit 9153b8bede3350750cb7a78891e0479cc72aa2ec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:25:41 +05:30
Rohit Yadav
c06ca09b54 engine/storage: add NPE check, break if parent snapshot is null 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:20:09 +05:30
Daan Hoogland
94e6b7587d CID-1256275 regression: resource leak in systemvm update code 
(cherry picked from commit 06d4458d0a9de5be7a7bf590678eb4b03989e9a1)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
 2015-01-12 20:51:51 +01:00
Wei Zhou
2720a1b49f CLOUDSTACK-8146: Resource count of primary storage does not consider the detached volumes 
(cherry picked from commit b528047fb6f1c199e5e1cfe991a10b72a2b32a49)
 2015-01-12 12:30:09 +01:00
Koushik Das
e0c495d357 Revert "CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network" 
This reverts commit 0bd34d389f93b56e74a6bb04054c8e419bf8571e.

Network GC is broken with out-of-band VM movements due to the original commit, so reverting.
 2014-12-23 11:56:40 +05:30