Commit Graph

23852 Commits

Author SHA1 Message Date
Rohit Yadav d4361b96d0 db: use explicit USE statements to avoid SQL failures
create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

(cherry picked from commit 09e26c826f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-23 02:02:47 +05:30
Rohit Yadav 34cefb17aa CLOUDSTACK-6541: Fix monthly recurring snapshot UI limit, limit to 1-28 days
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 070813a106)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-19 15:43:05 +05:30
Rohit Yadav 7341de39b9 CLOUDSTACK-5824: poll for delete snapshot and volume events
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a85aea74de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-19 15:34:33 +05:30
Marcus Sorensen fe5d41d8c3 CLOUDSTACK-8263: KVM - virsh resize doesnt refresh libvirt's view of the volume size, refresh pool
Change-Id: I5ea54f7389d72b57bb625e4d87b45b65eb0c96cd
2015-02-18 12:55:37 -08:00
Rohit Yadav 65172e3b9e Merge remote-tracking branch 'exoscale/usage-event-missing-for-os-stopped-instance' into 4.4
This closes #80
2015-02-18 11:14:25 +05:30
Marcus Sorensen fbb637791c CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient
Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6
2015-02-17 18:10:27 -08:00
Marcus Sorensen f0893d5794 CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
2015-02-17 17:23:18 -08:00
Pierre-Yves Ritschard 0ba75bcebd ensure agent reconciliation triggers events 2015-02-17 16:33:57 +01:00
Rohit Yadav a8273c0a94 CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e5cd75790a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:32:12 +05:30
Daan Hoogland fbafc957dc CLOUDSTACK-8238 handling of retry ping improved 2015-02-10 14:36:55 +01:00
Erik Weber 0c0c7dd070 Add absolute schema references to support MySQL 5.6 better
(and MySQL 5.5)
2015-02-08 16:55:39 +00:00
Rohit Yadav c19ec86c17 cloud-early-config: load-modules
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-06 15:33:24 +05:30
Jayapal f7a4d145a6 CLOUDSTACK-5494: Fixed dns is open to public in VR
(cherry picked from commit 81994cf443)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	systemvm/patches/debian/config/etc/init.d/cloud-early-config
2015-02-06 15:32:14 +05:30
Rohit Yadav c3d6996771 improve protocol enabling based on socket object type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d62d511f47)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 15:49:14 +05:30
Anthony Xu df92a45b05 fixed NPE
This closes #70

(cherry picked from commit 98b416b7f0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 12:12:59 +05:30
Rohit Yadav 422235c667 CLOUDSTACK-8198: Use random local storage UUID
Earlier host addition of multiple hosts with local storage failed due to
same local storage UUID being used where the storage path is same.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit bf17f640c6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-03 22:37:57 +05:30
Rohit Yadav 2a74548093 use a preferable protocol that works on jvm 1.6
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
2015-01-29 16:00:50 +05:30
Rohit Yadav f1cccf6fec appliance: hold on to openswan version, don't upgrade
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a10a9d522c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 23:22:33 +05:30
Rohit Yadav 15dd76c4c7 appliance: fix missing statement
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a3fa59eaf1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 23:14:36 +05:30
Rohit Yadav 44b4f3d8ee appliance: upgrade systemvm to latest packages
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit eca528dec7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 23:13:22 +05:30
Rohit Yadav 4752c1e6af appliance: use latest debian 7.8
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 61563d71ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	tools/appliance/build.sh
2015-01-28 18:11:28 +05:30
Daan Hoogland 1f209ff226 CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:59:40 +01:00
Marcus Sorensen 84a14f681f Introduced a typo in the license somehow on the last commit 2015-01-23 00:35:39 -08:00
Marcus Sorensen e2bb4cf583 LibvirtComputingResource: Expose KVMStoragePoolManager
KVMStoragePoolManager is a singleton in practice, any plugin
or extension of LibvirtComputingResource will need to act on
the specific instance of KVMStoragePoolManager that LibvirtComputingResource
has initialized. Therefore, expose this variable for those who
wish to call storage commands from plugins or extensions.

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2015-01-23 00:13:19 -08:00
Rohit Yadav c8b890bece services, awsapi: use better string comparision
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-22 18:11:39 +05:30
Rohit Yadav 0269456152 CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
2015-01-21 18:11:38 +05:30
Rohit Yadav 70f9db34cb CID 1264632: Rely on a known and widely available encoding UTF8
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0763b5576d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:49:56 +05:30
Abhinandan Prateek 7699c70ade CLOUDSTACK-8164: Look for all host to avoid NPE
(cherry picked from commit d8def3dc0b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-19 11:32:52 +05:30
Rohit Yadav 668541d6b6 CLOUDSTACK-8167: publish volume uuid on event bus in create snapshot cmd
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f6564b0b03)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:43:21 +05:30
Rohit Yadav ea3fb82f8f engine/storage: add NPE check, break if parent snapshot is null
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c06ca09b54)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:21:18 +05:30
Rohit Yadav a52bbfb2cc CLOUDSTACK-8166: add boundary checks in various usage parsers
- Add boundary condition to continue looping if creation data is after end date
- Add null pointer fix for create snapshot bug

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 065c556cf5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:15:48 +05:30
Pierre-Yves Ritschard 7cb19f5aa4 move ConstantTimeComparator to utils
(cherry picked from commit b2393c31ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
2015-01-14 20:42:17 +05:30
Pierre-Yves Ritschard 7f45df3593 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:40:30 +05:30
Erik Weber 7019253125 Add absolute schema references to support MySQL 5.6 better
(cherry picked from commit 396936ea5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 20:34:01 +05:30
Sateesh Chodapuneedi f642b19354 CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS
vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2015-01-12 21:40:34 +01:00
Daan Hoogland 1c78d5acc5 upgrade path 2015-01-09 16:10:06 +01:00
Daan Hoogland 4ade3fbeb4 serialization issue in json/gson 2015-01-05 12:57:09 +01:00
Daan Hoogland 8cf67c0bf7 logging in clustering code, to find faulty vif plug on xenserver from clustered ms on nic orchestration for start command 2015-01-05 12:57:00 +01:00
Likitha Shetty 4807fa7de6 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 33179cce56)
2014-12-23 21:52:23 +01:00
Likitha Shetty 53fbe84014 CLOUDSTACK-8109. Extract Template is failing.
Fix the OVA path that is returned once an OVA is packaged using a META file.

(cherry picked from commit 507d9d337d)
2014-12-23 16:29:09 +01:00
Likitha Shetty 9be404a93e 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 a75a431373)
2014-12-23 16:25:00 +01:00
Koushik Das 145b4a1f2c 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.

(cherry picked from commit 788fe5a273)
2014-12-23 16:04:46 +01:00
Daan Hoogland 79fc9d2687 CLOUDSTACK-7184 fieldname typo 2014-12-19 14:49:39 +01:00
Edison Su 0e312a7a77 CLOUDSTACK-7301, CLOUDSTACK-7947: double check if parent snapshot is removed or not
when creating new snapshot, check if parent snapshot is removed or not

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

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java

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

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
2014-12-18 18:27:56 +05:30
Daan Hoogland 86c425ec83 CLOUDSTACK-7184 c&p feature fix in conf-value-description 2014-12-18 12:23:53 +01:00
Daan Hoogland 8dfcd51beb CLOUDSTACK-7184 new config var is not available when not in the db 2014-12-18 11:51:54 +01:00
Remi Bergsma 49cf2ac916 use directIO flags when dd'ing template
This makes sure dom0 in xenserver doesn't get hammered
when copying templates. It doesn't make sense to use
the cache of dom0 as the template does not fit in
memory. The directIO flags prevent it from trying.

(cherry picked from commit 4e1527e87a)
2014-12-16 10:51:18 +01:00
Daan Hoogland 02feb0180a CLOUDSTACK-8073 load cidrs on create response 2014-12-15 15:58:42 +01:00
Rohit Yadav 2f2ff4bfc0 engine: Fix build regression
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 21:49:11 +05:30
Rohit Yadav 94cad49e07 CLOUDSTACK-8070: during 4.4.2 to 4.4.3 upgrade encrypt config that are hidden
In case there is an encryption key/password is provided the value, specifically
for router.ram.size will be encrypted otherwise it will remain plain text.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 20:43:53 +05:30