Santhosh Edukulla
78bfaa79cf
Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences
...
(cherry picked from commit ef6ec7b276 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 16:50:20 +05:30
Sheng Yang
405ed3ca50
CLOUDSTACK-7605: Fix basic zone multiple pod network restart with cleanup=true
...
1. getRouters() doesn't handle RestartNetwork with cleanup=true for basic zone,
because pod wouldn't be specific at the time.
2. The regression caused by the following fix. The variable "routers" was
overrided with some local values, result in only one of the routers in multiple
pods would return, thus only one router would be started.
commit 6dd5c3fd42
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Thu Oct 11 18:30:00 2012 +0530
CLOUDSTACK-70: Improve restart network behaviour for basic network
(cherry picked from commit aaeadc5c44 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 16:44:19 +05:30
Kishan Kavala
40e296dea4
CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume
...
(cherry picked from commit e427d0004c )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 16:32:35 +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 a8b89bea4f )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 16:24:06 +05:30
Saksham Srivastava
54d08a8e29
CLOUDSTACK-8091: Stale entry exists for a VM NIC even after an exception while adding a new nic to vm
...
(cherry picked from commit 4821bfffe2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 16:19:46 +05:30
Rohit Yadav
1cf165f86d
ApiResponseHelper: fix NPE when parent of snapshot is null
2015-02-05 17:10:56 +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 9eb8d538dd )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 16:37:59 +05:30
Santhosh Edukulla
c25263ba81
Fixed Coverity Issues
2015-02-05 15:59:29 +05:30
Damodar
01cc1b816d
CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine
...
(cherry picked from commit 781648fb10 )
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 50185b7c3a )
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
Kishan Kavala
6541354a59
Trigger user stats aggregation job at midnight in usage aggregation timezone
...
(cherry picked from commit 4ac96d637c )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2015-02-05 14:33:27 +05:30
Rajesh Battala
782adc106e
CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS
...
(cherry picked from commit 0f528df228 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 13:50:29 +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
Anthony Xu
98b416b7f0
fixed NPE
...
(cherry picked from commit c78f14cbc2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 12:10:09 +05:30
Rohit Yadav
876c78fe1b
CLOUDSTACK-8191: SAML users should have their own accounts
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 19:56:25 +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 cffae8eef0 )
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 5f9e4fddf3 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 14:30:18 +05:30
Likitha Shetty
272f282a05
CLOUDSTACK-8119. Propagate error message to UI for attach/detach volume failure operations.
...
For AttachVolume/DetachVolume API command, improve user error message in case of RuntimeException by throwing the exception instead of 'Unexpected Exception'.
(cherry picked from commit 4d7ede535d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/storage/VolumeApiServiceImpl.java
2015-02-02 13:57:38 +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 a5a65c7b55 )
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 15b348632d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 13:51:47 +05:30
Likitha Shetty
8f4aa23ae0
CLOUDSTACK-8127. VM name not displayed after attaching data disk to a VM.
...
If user hasn't supplied a display name for a VM, default it to VM name in listVolume response.
This behaviour is identical to listVirtualMachine response.
(cherry picked from commit ff7997a2b1 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 13:01:33 +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
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 c55bc0b2d1 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 14:43:10 +05:30
Saksham Srivastava
45108fdbad
CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly
...
(cherry picked from commit fc4dceaa99 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 14:38:03 +05:30
Nitin Mehta
31a6517402
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic of setting source template id to create() method than execute which was wrongly put in.
...
(cherry picked from commit e1a993d37b )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 12:07:42 +05:30
Nitin Mehta
a6f9411b1e
CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.
...
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering
(cherry picked from commit ee0f0a1cff )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 12:05:25 +05:30
Nitin Mehta
be0882b19e
CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on explicit enabling/disabling of the host and remove the logic for changing it when cluster/pod/zone is enabled/disabled. Also add the logic in capacity checker thread so that previous changes finally get consistent with this new model and also its good to have it for sanity reasons.
...
(cherry picked from commit ade305be20 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/capacity/CapacityManagerImpl.java
2015-01-20 11:58:04 +05:30
Nitin Mehta
665aa6b522
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
...
(cherry picked from commit e87bb20d0c )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:55:47 +05:30
Nitin Mehta
a12ab8a2b3
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
...
(cherry picked from commit 3907bc6f9d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:55: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 5213401ace )
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
Saksham Srivastava
6715c6ccfa
CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a ReverseProxy is there
...
(cherry picked from commit f0a4a639de )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:32:09 +05:30
Saksham Srivastava
6e5b9da7d4
CLOUDSTACK-7962: Change state to Volume State
...
(cherry picked from commit c615aafd77 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:30:05 +05:30
Saksham Srivastava
f88a34dabe
CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also
...
(cherry picked from commit 690a5ded35 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:29:59 +05:30
Sanjay Tripathi
b77cbea0f3
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
...
(cherry picked from commit d475b62838 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 11:29:34 +05:30
amoghvk
57f5d51a11
CLOUDSTACK-7976 : Param validation for global params involving domain name
...
(cherry picked from commit 95ea203907 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2015-01-20 10:36:11 +05:30
amoghvk
3cb4358270
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
(cherry picked from commit 960b7bbf74 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 10:31:05 +05:30
Koushik Das
37cdb4ecca
CLOUDSTACK-8054: No event generated on host maintenance mode is completed
...
Added events for host maintenance start and completion
(cherry picked from commit f6854bc984 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 10:23:37 +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
Kishan Kavala
1e87f3b80b
Bug-Id: CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM
...
(cherry picked from commit f767adfe71 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 18:19:24 +05:30
Rajesh Battala
5f117e6be9
CLOUDSTACK-6920 Support listing of LBHealthcheck policy with LBHealthcheck policy ID
...
(cherry picked from commit c7b23d0a10 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:31:15 +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 1df0453d27 )
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 9153b8bede )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:25:41 +05:30
Rohit Yadav
188924751e
CLOUDSTACK-7219: Fix NPE, log warning when config item is missing from scope
...
- Cherry picked from Daan's fix 63fbd16dd1
- Added another check if configDepot returned null
- Removed developer prefill values
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-15 19:13:40 +05:30
Pierre-Yves Ritschard
5ea7414746
move ConstantTimeComparator to utils
...
(cherry picked from commit b2393c31ed )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 20:25:32 +05:30
Pierre-Yves Ritschard
162c5af6f8
Use constant-time comparison functions when checking signatures
...
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit 9b4e39e837 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 20:25:21 +05:30
Rohit Yadav
921ad057de
CLOUDSTACK-8155: Remove unwanted whitespaces from json response
...
This removes extra whitespaces from the JSON serialized response.
After the fix, tested to work with:
- Present UI
- CloudMonkey
- Old buggy json parsers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 02:40:00 +05:30
Wei Zhou
1e8476d38a
CLOUDSTACK-8140: CS fails to start after secstorage/consoleproxy.service.offering is set to uuid
...
(cherry picked from commit 84c44b6314 )
2015-01-06 10:26:04 +01:00
Koushik Das
e0c495d357
Revert "CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network"
...
This reverts commit 0bd34d389f .
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
Koushik Das
788fe5a273
CLOUDSTACK-8103: Vmsync marks VM as stopped even after failing to stop it in HV
...
During vmsync if StopCommand (issued as part of PowerOff/PowerMissing report) fails to stop VM (since VM is running on HV),
don't transition VM state to "Stopped" in CS db. Also added a check to throw ConcurrentOperationException if vm state is not
"Running" after start operation.
2014-12-22 12:31:34 +05:30
Min Chen
c5d3a73c67
CLOUDSTACK-8101: volume sync not working as expected - MS restart during
...
upload volume leaves volume in hung state.
2014-12-19 16:43:02 -08:00