git commit: updated refs/heads/bugfix/CID-116538 to 1760a60

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-116538 [created] 1760a60eb


Fix resource leaks on exception paths


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1760a60e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1760a60e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1760a60e

Branch: refs/heads/bugfix/CID-116538
Commit: 1760a60ebc4cab1cf29430576af052957add7495
Parents: 50990c4
Author: Hugo Trippaers 
Authored: Tue Sep 16 09:27:05 2014 +0200
Committer: Hugo Trippaers 
Committed: Tue Sep 16 09:27:05 2014 +0200

--
 utils/src/com/cloud/utils/nio/Link.java  |  7 +++--
 utils/src/com/cloud/utils/nio/NioClient.java | 36 ---
 utils/src/com/cloud/utils/nio/NioServer.java | 11 +++
 3 files changed, 23 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1760a60e/utils/src/com/cloud/utils/nio/Link.java
--
diff --git a/utils/src/com/cloud/utils/nio/Link.java 
b/utils/src/com/cloud/utils/nio/Link.java
index 36a8e60..e4291d0 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -31,6 +31,7 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
+import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -159,7 +160,7 @@ public class Link {
 pkgBuf.clear();
 engResult = sslEngine.wrap(buffers, pkgBuf);
 if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED && 
engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
-engResult.getStatus() != SSLEngineResult.Status.OK) {
+engResult.getStatus() != SSLEngineResult.Status.OK) {
 throw new IOException("SSL: SSLEngine return bad result! " + 
engResult);
 }
 
@@ -285,7 +286,7 @@ public class Link {
 appBuf = ByteBuffer.allocate(sslSession.getApplicationBufferSize() 
+ 40);
 engResult = _sslEngine.unwrap(_readBuffer, appBuf);
 if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED && 
engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
-engResult.getStatus() != SSLEngineResult.Status.OK) {
+engResult.getStatus() != SSLEngineResult.Status.OK) {
 throw new IOException("SSL: SSLEngine return bad result! " + 
engResult);
 }
 if (remaining == _readBuffer.remaining()) {
@@ -405,7 +406,7 @@ public class Link {
 _connection.scheduleTask(task);
 }
 
-public static SSLContext initSSLContext(boolean isClient) throws Exception 
{
+public static SSLContext initSSLContext(boolean isClient) throws 
GeneralSecurityException, IOException {
 InputStream stream;
 SSLContext sslContext = null;
 KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1760a60e/utils/src/com/cloud/utils/nio/NioClient.java
--
diff --git a/utils/src/com/cloud/utils/nio/NioClient.java 
b/utils/src/com/cloud/utils/nio/NioClient.java
index 34d03c2..f4b1029 100755
--- a/utils/src/com/cloud/utils/nio/NioClient.java
+++ b/utils/src/com/cloud/utils/nio/NioClient.java
@@ -24,6 +24,7 @@ import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
+import java.security.GeneralSecurityException;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -48,30 +49,23 @@ public class NioClient extends NioConnection {
 @Override
 protected void init() throws IOException {
 _selector = Selector.open();
-SocketChannel sch = null;
-InetSocketAddress addr = null;
+Task task = null;
 
-try {
-sch = SocketChannel.open();
+try (SocketChannel sch = SocketChannel.open()) {
 sch.configureBlocking(true);
 s_logger.info("Connecting to " + _host + ":" + _port);
 
 if (_bindAddress != null) {
 s_logger.info("Binding outbound interface at " + _bindAddress);
 
-addr = new InetSocketAddress(_bindAddress, 0);
-sch.socket().bind(addr);
+InetSocketAddress bindAddr = new 
InetSocketAddress(_bindAddress, 0);
+sch.socket().bind(bindAddr);
 }
 
-addr =

[1/2] git commit: updated refs/heads/bugfix/CID-1116654 to 056f3f9

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1116654 [created] 056f3f98b


Fix resource leak CID-1116654

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f0f6f28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f0f6f28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f0f6f28

Branch: refs/heads/bugfix/CID-1116654
Commit: 2f0f6f28f9ed3484d2b97aa65e1d436588472f21
Parents: 50990c4
Author: Hugo Trippaers 
Authored: Tue Sep 16 09:45:43 2014 +0200
Committer: Hugo Trippaers 
Committed: Tue Sep 16 09:45:43 2014 +0200

--
 .../com/cloud/upgrade/dao/Upgrade410to420.java  | 178 ++-
 1 file changed, 90 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f0f6f28/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 097f6c5..18303b0 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -132,10 +132,10 @@ public class Upgrade410to420 implements DbUpgrade {
 }
 if (numRows > 0) {
 update =
-conn.prepareStatement("insert into `cloud`.`configuration` 
(`category`, `instance`, `component`, `name`, `value`, `description`) VALUES 
('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 
'If set to true, creates VMs as full clones on ESX hypervisor');");
+conn.prepareStatement("insert into 
`cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, 
`description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 
'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full 
clones on ESX hypervisor');");
 } else {
 update =
-conn.prepareStatement("insert into `cloud`.`configuration` 
(`category`, `instance`, `component`, `name`, `value`, `description`) VALUES 
('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'true', 
'If set to true, creates VMs as full clones on ESX hypervisor');");
+conn.prepareStatement("insert into 
`cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, 
`description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 
'vmware.create.full.clone' , 'true', 'If set to true, creates VMs as full 
clones on ESX hypervisor');");
 }
 update.executeUpdate();
 } catch (SQLException e) {
@@ -293,7 +293,7 @@ public class Upgrade410to420 implements DbUpgrade {
 PreparedStatement pstmt = null;
 try {
 pstmt =
-conn.prepareStatement("select value from 
`cloud`.`configuration` where category='" + category + "' and value is not NULL 
and name = '" + paramName + "';");
+conn.prepareStatement("select value from 
`cloud`.`configuration` where category='" + category + "' and value is not NULL 
and name = '" + paramName + "';");
 rs = pstmt.executeQuery();
 while (rs.next()) {
 return rs.getString("value");
@@ -354,7 +354,7 @@ public class Upgrade410to420 implements DbUpgrade {
 PreparedStatement pstmt2 = null;
 ResultSet rs2 = null;
 pstmt2 =
-conn.prepareStatement("SELECT affinity_group.id FROM 
`cloud`.`affinity_group` INNER JOIN `cloud`.`affinity_group_domain_map` ON 
affinity_group.id=affinity_group_domain_map.affinity_group_id WHERE 
affinity_group.type = 'ExplicitDedication' AND affinity_group.acl_type = 
'Domain'  AND  (affinity_group_domain_map.domain_id = ?)");
+conn.prepareStatement("SELECT affinity_group.id FROM 
`cloud`.`affinity_group` INNER JOIN `cloud`.`affinity_group_domain_map` ON 
affinity_group.id=affinity_group_domain_map.affinity_group_id WHERE 
affinity_group.type = 'ExplicitDedication' AND affinity_group.acl_type = 
'Domain'  AND  (affinity_group_domain_map.domain_id = ?)");
 pstmt2.setLong(1, domainId);
 rs2 = pstmt2.executeQuery();
 if (rs2.next()) {
@@ -381,7 +381,7 @@ public class Upgrade410to420 implements DbUpgrade {
 s_logger.debug("Adding AffinityGroup of type " + type + " 
for domain id " + domainId);
 
 String sql =
-"INSERT INTO `cloud`.`affinity_group` (`name`, `type`, 
`uuid`, `description`, `domain_id`, `account_id`, `acl_type`) VALUES (?, ?, ?, 
?, 1, 1, 'Domain')";
+   

[2/2] git commit: updated refs/heads/bugfix/CID-1116654 to 056f3f9

[hugo]

Fix CID-1116645

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/056f3f98
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/056f3f98
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/056f3f98

Branch: refs/heads/bugfix/CID-1116654
Commit: 056f3f98bb254a7366c37f0af75185163f0a1a0d
Parents: 2f0f6f2
Author: Hugo Trippaers 
Authored: Tue Sep 16 09:49:19 2014 +0200
Committer: Hugo Trippaers 
Committed: Tue Sep 16 09:49:19 2014 +0200

--
 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/056f3f98/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 18303b0..dab2b46 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -265,8 +265,8 @@ public class Upgrade410to420 implements DbUpgrade {
 while (clusterIt.hasNext()) {
 clusterId = clusterIt.next();
 keyValues = detailsMap.get(clusterId);
+clusterDetailsInsert = conn.prepareStatement("INSERT INTO 
`cloud`.`cluster_details` (cluster_id, name, value) VALUES (?, ?, ?)");
 for (Pair keyValuePair : keyValues) {
-clusterDetailsInsert = conn.prepareStatement("INSERT INTO 
`cloud`.`cluster_details` (cluster_id, name, value) VALUES (?, ?, ?)");
 key = keyValuePair.first();
 val = keyValuePair.second();
 clusterDetailsInsert.setLong(1, clusterId);

[1/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1232342 [created] 2fad1095b


spread tests over multiple travis environments


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32570c91
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32570c91
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32570c91

Branch: refs/heads/bugfix/CID-1232342
Commit: 32570c9107f8974b1ffac029c5fb81a37a349439
Parents: 50990c4
Author: imduffy15 
Authored: Tue Sep 16 10:00:08 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 10:00:08 2014 +0100

--
 .travis.yml | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32570c91/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index bc9b713..5de9ce3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,12 @@ jdk:
 notifications:
   email: false
 env:
-- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range test_iso 
test_multipleips_per_nic test_network test_non_contigiousvlan 
test_over_provisioning"
-- TESTS="test_portable_publicip test_primary_storage test_privategw_acl 
test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot 
test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm 
test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn"
+- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range"
+- TESTS="test_iso test_multipleips_per_nic test_network 
test_non_contigiousvlan test_over_provisioning"
+- TESTS="test_portable_publicip test_primary_storage test_privategw_acl 
test_public_ip_range test_pvlan"
+- TESTS="test_regions test_reset_vm_on_reboot test_resource_detail 
test_routers test_secondary_storage"
+- TESTS="test_service_offerings test_ssvm test_templates test_volumes 
test_vpc_vpn"
+- TESTS="misc/test_deploy_vm test_vm_life_cycle"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh

[2/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109

[duffy]

Adjust travis environments to try get each one to finish within 30mins.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7ce8d80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7ce8d80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7ce8d80

Branch: refs/heads/bugfix/CID-1232342
Commit: d7ce8d80be6813d646f0db45cb602b4a563b87ce
Parents: 32570c9
Author: imduffy15 
Authored: Tue Sep 16 10:40:52 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 10:40:52 2014 +0100

--
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7ce8d80/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 5de9ce3..20d7162 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,12 @@ notifications:
   email: false
 env:
 - TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range"
-- TESTS="test_iso test_multipleips_per_nic test_network 
test_non_contigiousvlan test_over_provisioning"
 - TESTS="test_portable_publicip test_primary_storage test_privategw_acl 
test_public_ip_range test_pvlan"
 - TESTS="test_regions test_reset_vm_on_reboot test_resource_detail 
test_routers test_secondary_storage"
 - TESTS="test_service_offerings test_ssvm test_templates test_volumes 
test_vpc_vpn"
 - TESTS="misc/test_deploy_vm test_vm_life_cycle"
+- TESTS="test_iso test_multipleips_per_nic"
+- TESTS="test_network test_non_contigiousvlan test_over_provisioning"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh

[3/3] git commit: updated refs/heads/bugfix/CID-1232342 to 2fad109

[duffy]

Fix CID-1232342


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fad1095
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fad1095
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fad1095

Branch: refs/heads/bugfix/CID-1232342
Commit: 2fad1095bfed0babe6e778c2fbc3da1e64cae566
Parents: d7ce8d8
Author: imduffy15 
Authored: Tue Sep 16 10:50:02 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 10:50:02 2014 +0100

--
 .../com/globo/globodns/cloudstack/resource/GloboDnsResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fad1095/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
--
diff --git 
a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
 
b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
index c167845..31759af 100644
--- 
a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
+++ 
b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
@@ -362,7 +362,7 @@ public class GloboDnsResource extends ManagerBase 
implements ServerResource {
 Record record = this.searchRecord(name, domainId);
 if (record == null) {
 // Create new record
-record = _globoDns.getRecordAPI().createRecord(domainId, name, ip, 
type);
+_globoDns.getRecordAPI().createRecord(domainId, name, ip, type);
 s_logger.info("Created record " + name + " in domain " + domainId);
 } else {
 if (!ip.equals(record.getContent())) {

git commit: updated refs/heads/bugfix/CID-1225202 to 4615877

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1225202 [created] 46158772e


Fix CID-1225202


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46158772
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46158772
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46158772

Branch: refs/heads/bugfix/CID-1225202
Commit: 46158772e80017fabb0cb124bd812f045dcac94a
Parents: 2fad109
Author: imduffy15 
Authored: Tue Sep 16 10:56:55 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 10:56:55 2014 +0100

--
 .../schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46158772/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
--
diff --git 
a/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java 
b/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
index 2305018..d30cf4c 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
@@ -74,7 +74,7 @@ public class UsageSecurityGroupDaoImpl extends 
GenericDaoBase

[1/3] Cleaning the README, INSTALL and CHANGES file

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 0066b77d5 -> 528ac4c6e


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/INSTALL.md
--
diff --git a/INSTALL.md b/INSTALL.md
index b92739a..74bac0c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,94 +1,55 @@
-This document describes how to develop, build, package and install Apache
-CloudStack. For more information please refer to:
+# Apache CloudStack Installation basics
 
-http://cloudstack.apache.org
+This document describes how to develop, build, package and install Apache
+CloudStack. For more information please refer to the official 
[documentation](http://docs.cloudstack.apache.org)
+or the developer 
[wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home).
 
 Apache CloudStack developers use various platforms for development, this guide
-was tested against a CentOS 6.2 x86_64 setup.
+was tested against a CentOS 6.5 x86_64 setup.
 
-Refer to the 
[wiki](http://cwiki.apache.org/confluence/display/CLOUDSTACK/Index)
-for the latest information, especially:
-
-  - [Setting up development 
environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment)
 for Apache CloudStack.
-  - 
[Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack)
 Apache CloudStack.
+* [Setting up development 
environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment)
 for Apache CloudStack.
+* 
[Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack)
 Apache CloudStack.
 
 ## Setting up Development Environment
 
-### Installing Tools and Dependencies
-
 Install tools and dependencies used for development:
 
 $ yum install git ant ant-devel java-1.7.0-openjdk java-1.7.0-openjdk-devel
 mysql mysql-server tomcat6 mkisofs gcc python MySQL-python openssh-clients 
wget
 
-Set up Maven (3.0.5):
-
-$ wget 
http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
-$ cd /usr/local/ # or any path
-$ tar -zxvf apache-maven-3.0.5-bin.tar.gz
-$ echo export M2_HOME=/usr/local/apache-maven-3.0.5 >> ~/.bashrc # or 
.zshrc or .profile
-$ echo export PATH=${M2_HOME}/bin:${PATH} >> ~/.bashrc # or .zshrc or 
.profile
-
-Note: Tomcat 6.0.35 has some known issue with Apache CloudStack, please use 
Tomcat
-6.0.33 from http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin
-
-### Configure Environment
+#yum -y update
+#yum -y install java-1.7.0-openjdk
+#yum -y install java-1.7.0-openjdk-devel
+#yum -y install mysql-server
+#yum -y install git
+#yum -y install genisoimage
 
-Set CATALINA_HOME to path where you extract/install tomcat, put them in your
-.bashrc or .zshrc or .profile:
-
-$ echo export CATALINA_HOME=/usr/share/tomcat6/ >> ~/.bashrc
-
-Fix permissions on CATALINA_HOME:
-
-$ chown -R : $CATALINA_HOME
-
-Generate you ssh keys, useful for ssh-ing to your hosts and vm etc.:
-
-$ ssh-keygen -t rsa -q
-
-Apache CloudStack uses some ports, make sure at least those used by the 
management
-server are available and not blocked by any local firewall. Following ports are
-used by Apache CloudStack and its entities:
-
-8080: API Server (authenticated), browser or CLI client to management 
server
-8096: API Server (unauthenticated), browser or CLI client to management 
server
-8787: Remote java debug debugging port, from IDE to management server
-9090: Management server to management server (cluster)
-7080: AWS API Server to which an AWS client can connect
-80/443: HTTP client to Secondary Storage VM (template download)
-111/2049: Secondary Storage to NFS server
-3922: Port used to ssh/scp into system vms (SSVM, CPVM, VR)
-8250: Agent (SSVM, CPVM, VR) to management server
-22, 80, 443: XenServer, XAPI
-22: KVM
-443: vCenter
-53: DNS
-111/2049: NFS
-3306: MySQL Server to which the management server connects
+Set up Maven (3.0.5):
 
-### Configuring MySQL Server
+#wget 
http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+#tar -zxvf apache-maven-3.0.5-bin.tar.gz -C /usr/local
+#cd /usr/local
+#ln -s apache-maven-3.0.5 maven
+#echo export M2_HOME=/usr/local/maven >> ~/.bashrc # or .zshrc or .profile
+#echo export PATH=/usr/local/maven/bin:${PATH} >> ~/.bashrc # or .zshrc or 
.profile
+#source ~/.bashrc
 
 Start the MySQL service:
 
 $ service mysqld start
 
-### Getting the Source Code
+## Getting the Source Code
 
 You may get the source code from the repository hosted on Apache:
 
-$ git clone git://git.apache.org/cloudstack.git
+$ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
 
-Or, you may fork a repository from the official Apache CloudStack mirror by
-Apache on [Github](https

[2/3] Cleaning the README, INSTALL and CHANGES file

[dahn]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 000..7f052a7
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,784 @@
+
+Apache CloudStack CHANGES
+==
+
+Full release notes for each release are located in the project's documentation 
[website](http://docs.cloudstack.apache.org/projects/cloudstack-release-notes)
+
+Version 4.4.0
+-
+
+This major release has the following bug fixes:
+
+Bug ID | Description
+--- | ---
+[CLOUDSTACK-6997](https://issues.apache.org/jira/browse/CLOUDSTACK-6997) | 
conntrack set to a very low value on router...
+[CLOUDSTACK-6996](https://issues.apache.org/jira/browse/CLOUDSTACK-6996) | 
Adding cluster to legacy zone failed...
+[CLOUDSTACK-6989](https://issues.apache.org/jira/browse/CLOUDSTACK-6989) | 
Redunant virtual router(RvR): When time synced by ntpd, RvR may result in FAULT 
...
+[CLOUDSTACK-6941](https://issues.apache.org/jira/browse/CLOUDSTACK-6941) | 
Can't choose storage for the volume, when attaching uploaded data volume to 
VM...
+[CLOUDSTACK-6925](https://issues.apache.org/jira/browse/CLOUDSTACK-6925) | 
[OVS] get rid custom logic to create bridges on hosts in the XenServer pool...
+[CLOUDSTACK-6908](https://issues.apache.org/jira/browse/CLOUDSTACK-6908) | 
ipv6 enabled by default...
+[CLOUDSTACK-6899](https://issues.apache.org/jira/browse/CLOUDSTACK-6899) | 
listNics doesn't have vm id in response but does take vm id as a param...
+[CLOUDSTACK-6869](https://issues.apache.org/jira/browse/CLOUDSTACK-6869) | 
Public key content is overridden by template's meta data when you create a 
insta...
+[CLOUDSTACK-6859](https://issues.apache.org/jira/browse/CLOUDSTACK-6859) | 
Management Server PermGen run out of memory after some time due to class 
leak
+[CLOUDSTACK-6850](https://issues.apache.org/jira/browse/CLOUDSTACK-6850) | Cpu 
cores, cpu speed and memory are not returned by listUsageRecords...
+[CLOUDSTACK-6816](https://issues.apache.org/jira/browse/CLOUDSTACK-6816) | 
cloudstack-setup-management make /root directory's permission 0777  
improperly...
+[CLOUDSTACK-6756](https://issues.apache.org/jira/browse/CLOUDSTACK-6756) | 
usage id is not being returned for an ip in deleted ip range...
+[CLOUDSTACK-6743](https://issues.apache.org/jira/browse/CLOUDSTACK-6743) | 
Race condition situation in MessageDetector may cause a outer tight loop to 
spin...
+[CLOUDSTACK-6714](https://issues.apache.org/jira/browse/CLOUDSTACK-6714) | 
Service monitoring conf is has issue with script in vmware...
+[CLOUDSTACK-6665](https://issues.apache.org/jira/browse/CLOUDSTACK-6665) | 
DHCP does not release ip addresses properly on VPC routers (edithosts.sh)...
+[CLOUDSTACK-6646](https://issues.apache.org/jira/browse/CLOUDSTACK-6646) | 
Conntrackd is started on non-redundant virtual router...
+[CLOUDSTACK-6578](https://issues.apache.org/jira/browse/CLOUDSTACK-6578) | 
DeleteRemoteAccessVpnCmd failed block enable Remote VPN access again on the IP 
a...
+[CLOUDSTACK-6577](https://issues.apache.org/jira/browse/CLOUDSTACK-6577) | 
Disable service monitoring in RVR...
+[CLOUDSTACK-6509](https://issues.apache.org/jira/browse/CLOUDSTACK-6509) | 
Cannot import multiple LDAP/AD users into a cloudstack account...
+[CLOUDSTACK-6478](https://issues.apache.org/jira/browse/CLOUDSTACK-6478) | 
Failed to download Template when having 3 SSVM's in one zone on Vmware...
+[CLOUDSTACK-6472](https://issues.apache.org/jira/browse/CLOUDSTACK-6472) | 
listUsageRecords generates NPEs for expunging instances...
+[CLOUDSTACK-6471](https://issues.apache.org/jira/browse/CLOUDSTACK-6471) | Add 
logs to better diagnose failures and errors in LDAP AD integration...
+[CLOUDSTACK-6396](https://issues.apache.org/jira/browse/CLOUDSTACK-6396) | KVM 
RBD Volumes shown as OVM, prevents snapshots...
+[CLOUDSTACK-6376](https://issues.apache.org/jira/browse/CLOUDSTACK-6376) | 
listnetworkacls api when called with a networkid of a network which was created 
...
+[CLOUDSTACK-6374](https://issues.apache.org/jira/browse/CLOUDSTACK-6374) | LB 
rules added while router reqiuires upgrade should be removed from lb vm map...
+[CLOUDSTACK-6371](https://issues.apache.org/jira/browse/CLOUDSTACK-6371) | KVM 
- secondary_storage count for account does not get incremted when snapshots ...
+[CLOUDSTACK-6358](https://issues.apache.org/jira/browse/CLOUDSTACK-6358) | 
Remove hardcoded guest OS mappings...
+[CLOUDSTACK-6356](https://issues.apache.org/jira/browse/CLOUDSTACK-6356) | 
OVS: tunnel networks does not work across the XenServer clusers...
+[CLOUDSTACK-6328](https://issues.apache.org/jira/browse/CLOUDSTACK-6328) | 
Prevent console proxy support scripts from spawning multiple java processes...
+[CLOUDSTACK-6322](https://issues.apache.org/jira/browse/CLOUDSTACK-6322) | 
Contrail: Params validation is missing while launching a service instance thru 

[3/3] git commit: updated refs/heads/4.4 to 528ac4c

[dahn]

Cleaning the README, INSTALL and CHANGES file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/528ac4c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/528ac4c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/528ac4c6

Branch: refs/heads/4.4
Commit: 528ac4c6e913b3e39b376965e744714e8496c4be
Parents: 0066b77
Author: Sebastien Goasguen 
Authored: Mon Sep 15 06:27:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Tue Sep 16 06:08:50 2014 -0400

--
 CHANGES  | 417 --
 CHANGES.md   | 784 ++
 INSTALL.md   | 215 +++---
 README.md| 197 +++--
 README.tools.md  | 260 ---
 pom.xml  |   3 +-
 tools/logo/apache_cloudstack.png | Bin 0 -> 155790 bytes
 7 files changed, 921 insertions(+), 955 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES
--
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index e3e316e..000
--- a/CHANGES
+++ /dev/null
@@ -1,417 +0,0 @@
-
-Apache CloudStack CHANGES
-==
-
-Full release notes for each release are located in the project's documentation 
website:  
-http://cloudstack.apache.org/docs
-
-Version 4.2.0
-
-
-In progress
-
-
-
-
-Version 4.1.0
-
-
-This is the second major release of CloudStack from within the Apache Software 
Foundation, and the
-first major release as a Top-Level Project (TLP). 
-
-Build Tool Changes:
-
- * The project now uses Maven 3 exclusively to build. 
-
-New Features:
-* CLOUDSTACK-101: OVS support in KVM
-* CLOUDSTACK-132: Mash up marvin into an interactive auto-completing API shell 
for CloudStack
-* CLOUDSTACK-241: AWS Style Regions
-* CLOUDSTACK-297: Reset SSH Key to access VM (similar to reset password)
-* CLOUDSTACK-299: Egress firewall rules for guest network
-* CLOUDSTACK-306: Support SRX & F5 inline mode
-* CLOUDSTACK-618: API request throttling to avoid malicious attacks on MS per 
account through frequent API request.
-* CLOUDSTACK-637: AutoScale
-* CLOUDSTACK-644: Resize volumes feature
-* CLOUDSTACK-706: Persistent Networks without running a VM
-* CLOUDSTACK-726: Implement L3 Router functionality in Nicira Nvp Plugin
-* CLOUDSTACK-780: Additional VMX Settings
-* CLOUDSTACK-926: ApiDiscoverService: Implement a plugin mechanism that 
exposes the list of APIs through a discovery service on the management server
-
-Bug Fixes:
-
-* CLOUDSTACK-1600 Typo in dpkg-buildpackage command
-* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida 
resource type even after parsing the valid resource type
-* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the 
formal one
-* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while 
executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd
-* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to 
BACKUP state
-* CLOUDSTACK-1509 Failed to implement network elements and resources while 
provisioning for persistent network(createVlanIpRange to an account]
-* CLOUDSTACK-1496 List API Performance: listAccounts failing with OOME for 
high values of pagesize (>1000 )
-* CLOUDSTACK-1487 cloudstack-setup-agent fails to set private.network.device 
on KVM host add
-* CLOUDSTACK-1485 Add Baremetal Provider back to 4.1 branch
-* CLOUDSTACK-1484 "API Throttling : api.throttling.enabled, Global setting 
missing"
-* CLOUDSTACK-1473 deleteDomain is failing with NPE
-* CLOUDSTACK-1470 unhandled exception executing api command: 
deployVirtualMachine
-* CLOUDSTACK-1469 kvm agent: agent service fails to start up
-* CLOUDSTACK-1465 List Zones returns null under create instance when logged is 
as user
-* CLOUDSTACK-1449 listAccounts and listProjectAccounts API lists all the users 
not account-specific users for each account returned
-* CLOUDSTACK-1447 [UI]Persistent Status is not displayed for VPC Tiers
-* CLOUDSTACK-1436 4.1 management server fails to start from RPM build artifacts
-* CLOUDSTACK-1429 single account is unable to use same vnet across multiple 
physical networks
-* CLOUDSTACK-1425 unhandled exception executing api command: 
migrateVirtualMachine & recoverVirtualMachine
-* CLOUDSTACK-1420 Ensure trademarks are properly attributed in publican brand.
-* CLOUDSTACK-1419 Apache-ify and apply trademark logos in the UI
-* CLOUDSTACK-1418 "As regular user , we are not allowed to deploy VM on a 
shared network."
-* CLOUDSTACK-1417 "When invalid values are passed to createNetwork() , error 
message does not indicate

git commit: updated refs/heads/master to 2648912

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 50990c404 -> 2648912af


Fix CID-122


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2648912a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2648912a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2648912a

Branch: refs/heads/master
Commit: 2648912afae44905ac1ee7513a2eef46cdaf0e41
Parents: 50990c4
Author: imduffy15 
Authored: Tue Sep 16 11:26:46 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 11:26:46 2014 +0100

--
 .../cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2648912a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
index ec3bc3a..26b443a 100755
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
@@ -477,7 +477,7 @@ public class XcpServerDiscoverer extends DiscovererBase 
implements Discoverer, L
 Boolean.parseBoolean(value);
 
 value = _params.get("xenserver.check.hvm");
-_checkHvm = false;
+_checkHvm = Boolean.parseBoolean(value);
 _connPool = XenServerConnectionPool.getInstance();
 
 _agentMgr.registerForHostEvents(this, true, false, true);

[03/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute 
offerings with NPE

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56c7fc80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56c7fc80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56c7fc80

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 56c7fc800ad12e2e3ccbf7fc79aaacd709f036b2
Parents: bd8eaf8
Author: Bharat Kumar 
Authored: Mon Sep 8 16:17:55 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Sep 10 13:27:21 2014 +0200

--
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56c7fc80/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 8a228ff..91af527 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1863,7 +1863,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 vmSrc.addNic(nic);
 }
 
-VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, 
null, _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()), null, null);
 _networkMgr.prepareNicForMigration(profile, dest);
 volumeMgr.prepareForMigration(profile, dest);
 

[06/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-7462: UI > Network > VPC > Router > Network ACL Lists > click an 
entry from list > Details tab > ACL List Rules tab > click Edit icon on any 
existing rule > fix the JavaScript error "args.jsonObj is undefined".


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa81823c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa81823c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa81823c

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: aa81823ce81540d83f3d14f3eceffa2783bfaaf5
Parents: f7d9ea2
Author: Jessica Wang 
Authored: Thu Sep 11 13:35:28 2014 -0700
Committer: Jessica Wang 
Committed: Thu Sep 11 13:35:28 2014 -0700

--
 ui/scripts/sharedFunctions.js | 66 +++---
 1 file changed, 33 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa81823c/ui/scripts/sharedFunctions.js
--
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index f58fdd2..1ed90c2 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -2089,42 +2089,42 @@ cloudStack.api = {
 }
 },
 dataProvider: function(args) {
-   args.response.success({
-data: args.jsonObj.tags
-});
-   
-   /*
-var resourceId = args.context[contextId][0].id;
-var data = {
-resourceId: resourceId,
-resourceType: resourceType
-};
-
-if (isAdmin() || isDomainAdmin()) {
-data.listAll = true;
-}
-
-if (args.context.projects) {
-data.projectid = args.context.projects[0].id;
-}
+   if (args.jsonObj != undefined) {
+   args.response.success({
+   data: args.jsonObj.tags
+   });
+   } else {
+   var resourceId = args.context[contextId][0].id;
+var data = {
+resourceId: resourceId,
+resourceType: resourceType
+};
+
+if (isAdmin() || isDomainAdmin()) {
+data.listAll = true;
+}
 
-if (args.jsonObj != null && args.jsonObj.projectid != null && 
data.projectid == null) {
-data.projectid = args.jsonObj.projectid;
-}
+if (args.context.projects) {
+data.projectid = args.context.projects[0].id;
+}
 
-$.ajax({
-url: createURL('listTags'),
-data: data,
-success: function(json) {
-args.response.success({
-data: json.listtagsresponse ? 
json.listtagsresponse.tag : []
-});
-},
-error: function(json) {
-args.response.error(parseXMLHttpResponse(json));
+if (args.jsonObj != null && args.jsonObj.projectid != null 
&& data.projectid == null) {
+data.projectid = args.jsonObj.projectid;
 }
-});
-*/
+
+$.ajax({
+url: createURL('listTags'),
+data: data,
+success: function(json) {
+args.response.success({
+data: json.listtagsresponse ? 
json.listtagsresponse.tag : []
+});
+},
+error: function(json) {
+args.response.error(parseXMLHttpResponse(json));
+}
+});
+   }   
 }
 };
 }

[05/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

Add "Edit Tags" functionality to SecurityGroup rules in UI

Signed-off-by: Ilia Shakitko 
(cherry picked from commit 281c866206036235790773fbcb86edede0ac739d)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7d9ea29
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7d9ea29
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7d9ea29

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: f7d9ea291be808a33829172234164e188673d9ed
Parents: 0152763
Author: Ilia Shakitko 
Authored: Thu Sep 11 12:25:09 2014 +0200
Committer: Wei Zhou 
Committed: Thu Sep 11 15:48:59 2014 +0200

--
 ui/scripts/network.js | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7d9ea29/ui/scripts/network.js
--
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index c0a9205..f6a8f3d 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -22,7 +22,8 @@
 protocol: elem.protocol,
 startport: elem.startport,
 endport: elem.endport,
-cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', 
elem.securitygroupname)
+cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', 
elem.securitygroupname),
+tags: elem.tags
 };
 
 if (elemData.startport == 0 && elemData.endport) {
@@ -4837,6 +4838,10 @@
 }
 },
 ignoreEmptyFields: true,
+tags: cloudStack.api.tags({
+resourceType: 'SecurityGroupRule',
+contextId: 'multiRule'
+}),
 dataProvider: function(args) {
 $.ajax({
 url: 
createURL('listSecurityGroups'),
@@ -5032,6 +5037,10 @@
 }
 },
 ignoreEmptyFields: true,
+tags: cloudStack.api.tags({
+resourceType: 'SecurityGroupRule',
+contextId: 'multiRule'
+}),
 dataProvider: function(args) {
 $.ajax({
 url: 
createURL('listSecurityGroups'),

[01/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/hotfix/4.4/CLOUDSTACK-7184 b0641a7d2 -> b82f27be4 (forced update)


CLOUDSTACK-7528: More verbose logging when sending alert fails

When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

(cherry picked from commit 91fd8d7cd5d5a83bf75f5f2972ad2eb2a4a07694)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/alert/AlertManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4f5ea3c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4f5ea3c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4f5ea3c

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: f4f5ea3cc02d931416579514a3289a607f7c5cac
Parents: bd8eaf8
Author: Rohit Yadav 
Authored: Wed Sep 10 11:29:30 2014 +0200
Committer: Rohit Yadav 
Committed: Wed Sep 10 11:45:02 2014 +0200

--
 server/src/com/cloud/alert/AlertManagerImpl.java | 2 +-
 usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/server/src/com/cloud/alert/AlertManagerImpl.java
--
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java 
b/server/src/com/cloud/alert/AlertManagerImpl.java
index 2a343d5..fc5b5fd 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -252,7 +252,7 @@ public class AlertManagerImpl extends ManagerBase 
implements AlertManager, Confi
 _emailAlert.sendAlert(alertType, dataCenterId, podId, null, 
subject, body);
 } else {
 s_alertsLogger.warn(" alertType:: " + alertType + " // 
dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + 
null +
-" // message:: " + subject);
+" // message:: " + subject + " // body:: " + body);
 }
 } catch (Exception ex) {
 s_logger.error("Problem sending email alert", ex);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
--
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java 
b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
index 67bb702..3c55f57 100644
--- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -105,7 +105,7 @@ public class UsageAlertManagerImpl extends ManagerBase 
implements AlertManager {
 _emailAlert.sendAlert(alertType, dataCenterId, podId, subject, 
body);
 } else {
 s_alertsLogger.warn(" alertType:: " + alertType + " // 
dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + 
null +
-" // message:: " + subject);
+" // message:: " + subject + " // body:: " + body);
 }
 } catch (Exception ex) {
 s_logger.error("Problem sending email alert", ex);

[02/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

appliance: fix newer debian iso links and checksums for debian

Signed-off-by: Rohit Yadav 
(cherry picked from commit ac5309b8b47ddb1e5588a2d5090f2bcce0e7c2a4)

Conflicts:
tools/appliance/definitions/systemvm64template/definition.rb
tools/appliance/definitions/systemvmtemplate/definition.rb


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a0f1550
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a0f1550
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a0f1550

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 3a0f1550289a8a2a50b0f786821cec2e5c914e62
Parents: f4f5ea3
Author: Rohit Yadav 
Authored: Tue Sep 9 18:37:15 2014 +0200
Committer: Daan Hoogland 
Committed: Wed Sep 10 12:41:37 2014 +0200

--
 tools/appliance/definitions/systemvm64template/definition.rb | 6 +++---
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a0f1550/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index f9308a0..bd59025 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.4.0-amd64-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso";,
-  :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
+  :iso_file => "debian-7.5.0-amd64-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso";,
+  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a0f1550/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index fcaab4d..9b57379 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.4.0-i386-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso";,
-  :iso_md5 => "7339b668a81b417ac023d73739dc6a03",
+  :iso_file => "debian-7.5.0-i386-netinst.iso",
+  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso";,
+  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

[04/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-6099' into 4.4


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01527635
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01527635
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01527635

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 015276350e41b30bde049ca0852811ed6262da16
Parents: 3a0f155 56c7fc8
Author: Daan Hoogland 
Authored: Wed Sep 10 13:59:14 2014 +0200
Committer: Daan Hoogland 
Committed: Wed Sep 10 13:59:14 2014 +0200

--
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[12/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

Cleaning the README, INSTALL and CHANGES file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/528ac4c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/528ac4c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/528ac4c6

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 528ac4c6e913b3e39b376965e744714e8496c4be
Parents: 0066b77
Author: Sebastien Goasguen 
Authored: Mon Sep 15 06:27:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Tue Sep 16 06:08:50 2014 -0400

--
 CHANGES  | 417 --
 CHANGES.md   | 784 ++
 INSTALL.md   | 215 +++---
 README.md| 197 +++--
 README.tools.md  | 260 ---
 pom.xml  |   3 +-
 tools/logo/apache_cloudstack.png | Bin 0 -> 155790 bytes
 7 files changed, 921 insertions(+), 955 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES
--
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index e3e316e..000
--- a/CHANGES
+++ /dev/null
@@ -1,417 +0,0 @@
-
-Apache CloudStack CHANGES
-==
-
-Full release notes for each release are located in the project's documentation 
website:  
-http://cloudstack.apache.org/docs
-
-Version 4.2.0
-
-
-In progress
-
-
-
-
-Version 4.1.0
-
-
-This is the second major release of CloudStack from within the Apache Software 
Foundation, and the
-first major release as a Top-Level Project (TLP). 
-
-Build Tool Changes:
-
- * The project now uses Maven 3 exclusively to build. 
-
-New Features:
-* CLOUDSTACK-101: OVS support in KVM
-* CLOUDSTACK-132: Mash up marvin into an interactive auto-completing API shell 
for CloudStack
-* CLOUDSTACK-241: AWS Style Regions
-* CLOUDSTACK-297: Reset SSH Key to access VM (similar to reset password)
-* CLOUDSTACK-299: Egress firewall rules for guest network
-* CLOUDSTACK-306: Support SRX & F5 inline mode
-* CLOUDSTACK-618: API request throttling to avoid malicious attacks on MS per 
account through frequent API request.
-* CLOUDSTACK-637: AutoScale
-* CLOUDSTACK-644: Resize volumes feature
-* CLOUDSTACK-706: Persistent Networks without running a VM
-* CLOUDSTACK-726: Implement L3 Router functionality in Nicira Nvp Plugin
-* CLOUDSTACK-780: Additional VMX Settings
-* CLOUDSTACK-926: ApiDiscoverService: Implement a plugin mechanism that 
exposes the list of APIs through a discovery service on the management server
-
-Bug Fixes:
-
-* CLOUDSTACK-1600 Typo in dpkg-buildpackage command
-* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida 
resource type even after parsing the valid resource type
-* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the 
formal one
-* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while 
executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd
-* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to 
BACKUP state
-* CLOUDSTACK-1509 Failed to implement network elements and resources while 
provisioning for persistent network(createVlanIpRange to an account]
-* CLOUDSTACK-1496 List API Performance: listAccounts failing with OOME for 
high values of pagesize (>1000 )
-* CLOUDSTACK-1487 cloudstack-setup-agent fails to set private.network.device 
on KVM host add
-* CLOUDSTACK-1485 Add Baremetal Provider back to 4.1 branch
-* CLOUDSTACK-1484 "API Throttling : api.throttling.enabled, Global setting 
missing"
-* CLOUDSTACK-1473 deleteDomain is failing with NPE
-* CLOUDSTACK-1470 unhandled exception executing api command: 
deployVirtualMachine
-* CLOUDSTACK-1469 kvm agent: agent service fails to start up
-* CLOUDSTACK-1465 List Zones returns null under create instance when logged is 
as user
-* CLOUDSTACK-1449 listAccounts and listProjectAccounts API lists all the users 
not account-specific users for each account returned
-* CLOUDSTACK-1447 [UI]Persistent Status is not displayed for VPC Tiers
-* CLOUDSTACK-1436 4.1 management server fails to start from RPM build artifacts
-* CLOUDSTACK-1429 single account is unable to use same vnet across multiple 
physical networks
-* CLOUDSTACK-1425 unhandled exception executing api command: 
migrateVirtualMachine & recoverVirtualMachine
-* CLOUDSTACK-1420 Ensure trademarks are properly attributed in publican brand.
-* CLOUDSTACK-1419 Apache-ify and apply trademark logos in the UI
-* CLOUDSTACK-1418 "As regular user , we are not allowed to deploy VM on a 
shared network."
-* CLOUDSTACK-1417 "When invalid values are passed to createNetwork() , error 
me

[13/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d065b9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d065b9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d065b9a

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 4d065b9a3a336d59902c266202c1094509c007d2
Parents: 528ac4c
Author: Daan Hoogland 
Authored: Tue Sep 9 22:19:54 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 12:25:07 2014 +0200

--
 .../hypervisor/xen/discoverer/XcpServerDiscoverer.java  |  1 +
 .../hypervisor/xen/resource/CitrixResourceBase.java |  8 ++--
 scripts/vm/hypervisor/xenserver/launch_hb.sh|  7 ++-
 scripts/vm/hypervisor/xenserver/vmopspremium|  3 ++-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 12 
 server/src/com/cloud/configuration/Config.java  | 10 +-
 .../cloud/configuration/ConfigurationManagerImpl.java   |  1 +
 server/src/com/cloud/resource/DiscovererBase.java   |  1 +
 .../root/redundant_router/check_heartbeat.sh.templ  |  4 ++--
 9 files changed, 36 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 0e7cf74..eda28f3 100755
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -347,6 +347,7 @@ public class XcpServerDiscoverer extends DiscovererBase 
implements Discoverer, L
 details.put("wait", Integer.toString(_wait));
 params.put("migratewait", 
_configDao.getValue(Config.MigrateWait.toString()));
 params.put(Config.XenMaxNics.toString().toLowerCase(), 
_configDao.getValue(Config.XenMaxNics.toString()));
+
params.put(Config.XenHeartBeatTimeout.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatTimeout.toString()));
 
params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatInterval.toString()));
 params.put(Config.InstanceName.toString().toLowerCase(), 
_instance);
 details.put(Config.InstanceName.toString().toLowerCase(), 
_instance);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c1c9795..644ef65 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -289,6 +289,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 protected IAgentControl _agentControl;
 
 final int _maxWeight = 256;
+protected int _heartbeatTimeout = 120;
 protected int _heartbeatInterval = 60;
 protected final XsHost _host = new XsHost();
 
@@ -4603,8 +4604,10 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 
 protected boolean launchHeartBeat(Connection conn) {
-String result = callHostPluginPremium(conn, "heartbeat", "host", 
_host.uuid, "interval", Integer
-.toString(_heartbeatInterval));
+String result = callHostPluginPremium(conn, "heartbeat",
+"host", _host.uuid,
+"timeout", Integer.toString(_heartbeatTimeout),
+"interval", Integer.toString(_heartbeatInterval));
 if (result == null || !result.contains("> DONE <")) {
 s_logger.warn("Unable to launch the heartbeat process on " + 
_host.ip);
 return false;
@@ -5674,6 +5677,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 _storageNetworkName1 = (String)params.get("storage.network.device1");
 _storageNetworkName2 = (String)params.get("storage.network.device2");
 
+_heartbeatTimeout = 
NumbersUtil.parseInt((String)params.get("xen.heartbeat.timeout"), 120);
 _heartbeatInterval = 
NumbersUtil.parseInt((

[14/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a694d4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a694d4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a694d4d

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 7a694d4deb0d74a18c7bac8bfffa8faf6fa5d835
Parents: 4d065b9
Author: Daan Hoogland 
Authored: Wed Sep 10 11:46:46 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 12:25:10 2014 +0200

--
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a694d4d/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
--
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh 
b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 88f4841..b4ef56e 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -109,4 +109,4 @@ do
 done
 
 /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date 
+%s) - $lastdate)) seconds, rebooting system!"
-reboot -f
+echo b > /proc/sysrq-trigger
\ No newline at end of file

[15/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-7184 retry-wait loop config to deal with network glitches


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b82f27be
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b82f27be
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b82f27be

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: b82f27be4150e70c017ed2597137319daa79560b
Parents: 7a694d4
Author: Daan Hoogland 
Authored: Tue Sep 16 12:20:30 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 12:49:36 2014 +0200

--
 .../com/cloud/agent/manager/DirectAgentAttache.java| 13 -
 .../hypervisor/xen/resource/CitrixResourceBase.java|  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b82f27be/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
--
diff --git 
a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java 
b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
index 7ca6929..480a7af 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.Logger;
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.api.Answer;
@@ -40,6 +41,10 @@ import com.cloud.resource.ServerResource;
 public class DirectAgentAttache extends AgentAttache {
 private final static Logger s_logger = 
Logger.getLogger(DirectAgentAttache.class);
 
+protected final ConfigKey _HostPingRetryCount = new 
ConfigKey("Advanced", Integer.class, "host.ping.retry.count", "2",
+"Number of times retrying a host ping while waiting for check 
results", true);
+protected final ConfigKey _HostPingRetryTimer = new 
ConfigKey("Advanced", Integer.class, "host.ping.retry.timer", "20",
+"Interval to wait before retrying a host ping while waiting for 
check results", true);
 ServerResource _resource;
 List> _futures = new ArrayList>();
 AgentManagerImpl _mgr;
@@ -161,7 +166,13 @@ public class DirectAgentAttache extends AgentAttache {
 ServerResource resource = _resource;
 
 if (resource != null) {
-PingCommand cmd = resource.getCurrentStatus(_id);
+PingCommand cmd = null;
+int retried = 0;
+while ( cmd == null && ++retried < 
_HostPingRetryCount.value())
+{
+cmd = resource.getCurrentStatus(_id);
+Thread.sleep(1000*_HostPingRetryTimer.value());
+}
 if (cmd == null) {
 s_logger.warn("Unable to get current status on " + _id 
+ "(" + _name + ")");
 return;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b82f27be/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 644ef65..a399c98 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4276,7 +4276,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 if (!pingXAPI()) {
 Thread.sleep(1000);
 if (!pingXAPI()) {
-s_logger.warn(" can not ping xenserver " + _host.uuid);
+s_logger.warn("can not ping xenserver " + _host.uuid);
 return null;
 }
 }

[08/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-6738: pre-seed expunge delay and interval to 60s


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/723eaefd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/723eaefd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/723eaefd

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 723eaefdf9c139d920a94202962cfd691589c304
Parents: 213bdbd
Author: Rohit Yadav 
Authored: Mon Sep 15 14:45:05 2014 +0200
Committer: Rohit Yadav 
Committed: Mon Sep 15 14:45:05 2014 +0200

--
 developer/developer-prefill.sql | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723eaefd/developer/developer-prefill.sql
--
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 7b423a1..e5fb4e3 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -56,6 +56,14 @@ INSERT INTO `cloud`.`configuration` (category, instance, 
component, name, value)
 
 INSERT INTO `cloud`.`configuration` (category, instance, component, name, 
value)
 VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.delay', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, 
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, 
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
 'system.vm.use.local.storage', 'true');
 
 -- Add developer configuration entry; allows management server to be run as a 
user other than "cloud"

[07/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

CLOUDSTACK-6223. removeNicFromVirtualMachine fails if another instance in 
another domain has a nic with the same ip and a forwarding rule configured on it

Signed-off-by: Daan Hoogland 
(cherry picked from commit e9af5f44ae080da3f191cba57b55747801c3100e)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/213bdbde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/213bdbde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/213bdbde

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 213bdbde35e273b2c40d421071e46f2af6de729c
Parents: aa81823
Author: Upendra Moturi 
Authored: Tue Apr 1 18:26:44 2014 +0530
Committer: Daan Hoogland 
Committed: Fri Sep 12 12:07:04 2014 +0200

--
 .../com/cloud/network/rules/dao/PortForwardingRulesDao.java  | 2 ++
 .../cloud/network/rules/dao/PortForwardingRulesDaoImpl.java  | 8 
 server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
--
diff --git 
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java 
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
index 4694cb9..5b0e748 100644
--- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
+++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
@@ -44,5 +44,7 @@ public interface PortForwardingRulesDao extends 
GenericDao listByDestIpAddr(String ip4Address);
 
+List listByVmidAndDestIpAddr(String ip4Address,long 
vmid);
+
 PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
--
diff --git 
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java 
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
index 45c0aeb..6bc401b 100644
--- 
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
+++ 
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
@@ -158,6 +158,14 @@ public class PortForwardingRulesDaoImpl extends 
GenericDaoBase listByVmidAndDestIpAddr(String 
ip4Address,long vmid) {
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("dstIp", ip4Address);
+sc.setParameters("vmId", vmid);
+return listBy(sc);
+}
+
+@Override
 public PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp) {
 SearchCriteria sc = AllFieldsSearch.create();
 sc.setParameters("id", id);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/213bdbde/server/src/com/cloud/network/rules/RulesManagerImpl.java
--
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java 
b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index eea1262..59025f2 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1465,7 +1465,7 @@ public class RulesManagerImpl extends ManagerBase 
implements RulesManager, Rules
 public List listAssociatedRulesForGuestNic(Nic nic) {
 List result = new ArrayList();
 // add PF rules
-
result.addAll(_portForwardingDao.listByDestIpAddr(nic.getIp4Address()));
+
result.addAll(_portForwardingDao.listByVmidAndDestIpAddr(nic.getIp4Address(),nic.getInstanceId()));
 // add static NAT rules
 List staticNatRules = 
_firewallDao.listStaticNatByVmId(nic.getInstanceId());
 for (FirewallRuleVO rule : staticNatRules) {

[10/15] Cleaning the README, INSTALL and CHANGES file

[dahn]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/INSTALL.md
--
diff --git a/INSTALL.md b/INSTALL.md
index b92739a..74bac0c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,94 +1,55 @@
-This document describes how to develop, build, package and install Apache
-CloudStack. For more information please refer to:
+# Apache CloudStack Installation basics
 
-http://cloudstack.apache.org
+This document describes how to develop, build, package and install Apache
+CloudStack. For more information please refer to the official 
[documentation](http://docs.cloudstack.apache.org)
+or the developer 
[wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home).
 
 Apache CloudStack developers use various platforms for development, this guide
-was tested against a CentOS 6.2 x86_64 setup.
+was tested against a CentOS 6.5 x86_64 setup.
 
-Refer to the 
[wiki](http://cwiki.apache.org/confluence/display/CLOUDSTACK/Index)
-for the latest information, especially:
-
-  - [Setting up development 
environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment)
 for Apache CloudStack.
-  - 
[Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack)
 Apache CloudStack.
+* [Setting up development 
environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment)
 for Apache CloudStack.
+* 
[Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack)
 Apache CloudStack.
 
 ## Setting up Development Environment
 
-### Installing Tools and Dependencies
-
 Install tools and dependencies used for development:
 
 $ yum install git ant ant-devel java-1.7.0-openjdk java-1.7.0-openjdk-devel
 mysql mysql-server tomcat6 mkisofs gcc python MySQL-python openssh-clients 
wget
 
-Set up Maven (3.0.5):
-
-$ wget 
http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
-$ cd /usr/local/ # or any path
-$ tar -zxvf apache-maven-3.0.5-bin.tar.gz
-$ echo export M2_HOME=/usr/local/apache-maven-3.0.5 >> ~/.bashrc # or 
.zshrc or .profile
-$ echo export PATH=${M2_HOME}/bin:${PATH} >> ~/.bashrc # or .zshrc or 
.profile
-
-Note: Tomcat 6.0.35 has some known issue with Apache CloudStack, please use 
Tomcat
-6.0.33 from http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin
-
-### Configure Environment
+#yum -y update
+#yum -y install java-1.7.0-openjdk
+#yum -y install java-1.7.0-openjdk-devel
+#yum -y install mysql-server
+#yum -y install git
+#yum -y install genisoimage
 
-Set CATALINA_HOME to path where you extract/install tomcat, put them in your
-.bashrc or .zshrc or .profile:
-
-$ echo export CATALINA_HOME=/usr/share/tomcat6/ >> ~/.bashrc
-
-Fix permissions on CATALINA_HOME:
-
-$ chown -R : $CATALINA_HOME
-
-Generate you ssh keys, useful for ssh-ing to your hosts and vm etc.:
-
-$ ssh-keygen -t rsa -q
-
-Apache CloudStack uses some ports, make sure at least those used by the 
management
-server are available and not blocked by any local firewall. Following ports are
-used by Apache CloudStack and its entities:
-
-8080: API Server (authenticated), browser or CLI client to management 
server
-8096: API Server (unauthenticated), browser or CLI client to management 
server
-8787: Remote java debug debugging port, from IDE to management server
-9090: Management server to management server (cluster)
-7080: AWS API Server to which an AWS client can connect
-80/443: HTTP client to Secondary Storage VM (template download)
-111/2049: Secondary Storage to NFS server
-3922: Port used to ssh/scp into system vms (SSVM, CPVM, VR)
-8250: Agent (SSVM, CPVM, VR) to management server
-22, 80, 443: XenServer, XAPI
-22: KVM
-443: vCenter
-53: DNS
-111/2049: NFS
-3306: MySQL Server to which the management server connects
+Set up Maven (3.0.5):
 
-### Configuring MySQL Server
+#wget 
http://www.us.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+#tar -zxvf apache-maven-3.0.5-bin.tar.gz -C /usr/local
+#cd /usr/local
+#ln -s apache-maven-3.0.5 maven
+#echo export M2_HOME=/usr/local/maven >> ~/.bashrc # or .zshrc or .profile
+#echo export PATH=/usr/local/maven/bin:${PATH} >> ~/.bashrc # or .zshrc or 
.profile
+#source ~/.bashrc
 
 Start the MySQL service:
 
 $ service mysqld start
 
-### Getting the Source Code
+## Getting the Source Code
 
 You may get the source code from the repository hosted on Apache:
 
-$ git clone git://git.apache.org/cloudstack.git
+$ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
 
-Or, you may fork a repository from the official Apache CloudStack mirror by
-Apache on [Github](https://github.com/apache/cloudstack)
+Or, you may fork the repository from the official

[11/15] Cleaning the README, INSTALL and CHANGES file

[dahn]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/528ac4c6/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 000..7f052a7
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,784 @@
+
+Apache CloudStack CHANGES
+==
+
+Full release notes for each release are located in the project's documentation 
[website](http://docs.cloudstack.apache.org/projects/cloudstack-release-notes)
+
+Version 4.4.0
+-
+
+This major release has the following bug fixes:
+
+Bug ID | Description
+--- | ---
+[CLOUDSTACK-6997](https://issues.apache.org/jira/browse/CLOUDSTACK-6997) | 
conntrack set to a very low value on router...
+[CLOUDSTACK-6996](https://issues.apache.org/jira/browse/CLOUDSTACK-6996) | 
Adding cluster to legacy zone failed...
+[CLOUDSTACK-6989](https://issues.apache.org/jira/browse/CLOUDSTACK-6989) | 
Redunant virtual router(RvR): When time synced by ntpd, RvR may result in FAULT 
...
+[CLOUDSTACK-6941](https://issues.apache.org/jira/browse/CLOUDSTACK-6941) | 
Can't choose storage for the volume, when attaching uploaded data volume to 
VM...
+[CLOUDSTACK-6925](https://issues.apache.org/jira/browse/CLOUDSTACK-6925) | 
[OVS] get rid custom logic to create bridges on hosts in the XenServer pool...
+[CLOUDSTACK-6908](https://issues.apache.org/jira/browse/CLOUDSTACK-6908) | 
ipv6 enabled by default...
+[CLOUDSTACK-6899](https://issues.apache.org/jira/browse/CLOUDSTACK-6899) | 
listNics doesn't have vm id in response but does take vm id as a param...
+[CLOUDSTACK-6869](https://issues.apache.org/jira/browse/CLOUDSTACK-6869) | 
Public key content is overridden by template's meta data when you create a 
insta...
+[CLOUDSTACK-6859](https://issues.apache.org/jira/browse/CLOUDSTACK-6859) | 
Management Server PermGen run out of memory after some time due to class 
leak
+[CLOUDSTACK-6850](https://issues.apache.org/jira/browse/CLOUDSTACK-6850) | Cpu 
cores, cpu speed and memory are not returned by listUsageRecords...
+[CLOUDSTACK-6816](https://issues.apache.org/jira/browse/CLOUDSTACK-6816) | 
cloudstack-setup-management make /root directory's permission 0777  
improperly...
+[CLOUDSTACK-6756](https://issues.apache.org/jira/browse/CLOUDSTACK-6756) | 
usage id is not being returned for an ip in deleted ip range...
+[CLOUDSTACK-6743](https://issues.apache.org/jira/browse/CLOUDSTACK-6743) | 
Race condition situation in MessageDetector may cause a outer tight loop to 
spin...
+[CLOUDSTACK-6714](https://issues.apache.org/jira/browse/CLOUDSTACK-6714) | 
Service monitoring conf is has issue with script in vmware...
+[CLOUDSTACK-6665](https://issues.apache.org/jira/browse/CLOUDSTACK-6665) | 
DHCP does not release ip addresses properly on VPC routers (edithosts.sh)...
+[CLOUDSTACK-6646](https://issues.apache.org/jira/browse/CLOUDSTACK-6646) | 
Conntrackd is started on non-redundant virtual router...
+[CLOUDSTACK-6578](https://issues.apache.org/jira/browse/CLOUDSTACK-6578) | 
DeleteRemoteAccessVpnCmd failed block enable Remote VPN access again on the IP 
a...
+[CLOUDSTACK-6577](https://issues.apache.org/jira/browse/CLOUDSTACK-6577) | 
Disable service monitoring in RVR...
+[CLOUDSTACK-6509](https://issues.apache.org/jira/browse/CLOUDSTACK-6509) | 
Cannot import multiple LDAP/AD users into a cloudstack account...
+[CLOUDSTACK-6478](https://issues.apache.org/jira/browse/CLOUDSTACK-6478) | 
Failed to download Template when having 3 SSVM's in one zone on Vmware...
+[CLOUDSTACK-6472](https://issues.apache.org/jira/browse/CLOUDSTACK-6472) | 
listUsageRecords generates NPEs for expunging instances...
+[CLOUDSTACK-6471](https://issues.apache.org/jira/browse/CLOUDSTACK-6471) | Add 
logs to better diagnose failures and errors in LDAP AD integration...
+[CLOUDSTACK-6396](https://issues.apache.org/jira/browse/CLOUDSTACK-6396) | KVM 
RBD Volumes shown as OVM, prevents snapshots...
+[CLOUDSTACK-6376](https://issues.apache.org/jira/browse/CLOUDSTACK-6376) | 
listnetworkacls api when called with a networkid of a network which was created 
...
+[CLOUDSTACK-6374](https://issues.apache.org/jira/browse/CLOUDSTACK-6374) | LB 
rules added while router reqiuires upgrade should be removed from lb vm map...
+[CLOUDSTACK-6371](https://issues.apache.org/jira/browse/CLOUDSTACK-6371) | KVM 
- secondary_storage count for account does not get incremted when snapshots ...
+[CLOUDSTACK-6358](https://issues.apache.org/jira/browse/CLOUDSTACK-6358) | 
Remove hardcoded guest OS mappings...
+[CLOUDSTACK-6356](https://issues.apache.org/jira/browse/CLOUDSTACK-6356) | 
OVS: tunnel networks does not work across the XenServer clusers...
+[CLOUDSTACK-6328](https://issues.apache.org/jira/browse/CLOUDSTACK-6328) | 
Prevent console proxy support scripts from spawning multiple java processes...
+[CLOUDSTACK-6322](https://issues.apache.org/jira/browse/CLOUDSTACK-6322) | 
Contrail: Params validation is missing while launching a service instance thru 

[09/15] git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b82f27b

[dahn]

Remove the misc tests from travis as they do not exist in 4.4


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0066b77d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0066b77d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0066b77d

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: 0066b77d57c574925ef33495e9a81f4304d63ae9
Parents: 723eaef
Author: imduffy15 
Authored: Mon Sep 15 16:18:57 2014 +0100
Committer: imduffy15 
Committed: Mon Sep 15 16:18:57 2014 +0100

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0066b77d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 007d466..8ba3c4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ notifications:
 env:
 - TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range test_iso 
test_multipleips_per_nic test_network test_non_contigiousvlan 
test_over_provisioning"
 - TESTS="test_portable_publicip test_primary_storage test_privategw_acl 
test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot 
test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm 
test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn"
+- TESTS="test_secondary_storage test_service_offerings test_ssvm 
test_templates test_vm_life_cycle test_volumes test_vpc_vpn"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh

svn commit: r1625246 - /cloudstack/site/trunk/content/archives.mdtext

[sebgoa]

Author: sebgoa
Date: Tue Sep 16 11:37:07 2014
New Revision: 1625246

URL: http://svn.apache.org/r1625246
Log:
Adding 4.3.1 release to the archives listing

Modified:
cloudstack/site/trunk/content/archives.mdtext

Modified: cloudstack/site/trunk/content/archives.mdtext
URL: 
http://svn.apache.org/viewvc/cloudstack/site/trunk/content/archives.mdtext?rev=1625246&r1=1625245&r2=1625246&view=diff
==
--- cloudstack/site/trunk/content/archives.mdtext (original)
+++ cloudstack/site/trunk/content/archives.mdtext Tue Sep 16 11:37:07 2014
@@ -1,5 +1,6 @@
 Archived Releases
 
+* 
[apache-cloudstack-4.3.1.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2)
 [ 
[PGP](http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc)
 ][ 
[MD5](http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5)
 ][ 
[SHA512](http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha)
 ]
 * 
[apache-cloudstack-4.3.0.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2)
 [ 
[PGP](http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.asc)
 ][ 
[MD5](http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.md5)
 ][ 
[SHA512](http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.sha)
 ]
 * 
[apache-cloudstack-4.2.1.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2)
 [ 
[PGP](http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc)
 ][ 
[MD5](http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5)
 ][ 
[SHA512](http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha)
 ]
 * 
[apache-cloudstack-4.2.0.src.tar.bz2](http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2)
 [ 
[PGP](http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.asc)
 ][ 
[MD5](http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.md5)
 ][ 
[SHA512](http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.sha)
 ]

svn commit: r922380 - in /websites/staging/cloudstack/trunk/content: ./ archives.html

[buildbot]

Author: buildbot
Date: Tue Sep 16 11:41:01 2014
New Revision: 922380

Log:
Staging update by buildbot for cloudstack

Modified:
websites/staging/cloudstack/trunk/content/   (props changed)
websites/staging/cloudstack/trunk/content/archives.html

Propchange: websites/staging/cloudstack/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 16 11:41:01 2014
@@ -1 +1 @@
-1622210
+1625246

Modified: websites/staging/cloudstack/trunk/content/archives.html
==
--- websites/staging/cloudstack/trunk/content/archives.html (original)
+++ websites/staging/cloudstack/trunk/content/archives.html Tue Sep 16 11:41:01 
2014
@@ -123,6 +123,7 @@
  Archived Releases
 
 
+http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2";>apache-cloudstack-4.3.1.src.tar.bz2
 [ http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.asc";>PGP
 ][ http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.md5";>MD5
 ][ http://archive.apache.org/dist/cloudstack/releases/4.3.1/apache-cloudstack-4.3.1-src.tar.bz2.sha";>SHA512
 ]
 http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2";>apache-cloudstack-4.3.0.src.tar.bz2
 [ http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.asc";>PGP
 ][ http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.md5";>MD5
 ][ http://archive.apache.org/dist/cloudstack/releases/4.3.0/apache-cloudstack-4.3.0-src.tar.bz2.sha";>SHA512
 ]
 http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2";>apache-cloudstack-4.2.1.src.tar.bz2
 [ http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc";>PGP
 ][ http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5";>MD5
 ][ http://archive.apache.org/dist/cloudstack/releases/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha";>SHA512
 ]
 http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2";>apache-cloudstack-4.2.0.src.tar.bz2
 [ http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.asc";>PGP
 ][ http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.md5";>MD5
 ][ http://archive.apache.org/dist/cloudstack/releases/4.2.0/apache-cloudstack-4.2.0-src.tar.bz2.sha";>SHA512
 ]

svn commit: r922381 - /websites/production/cloudstack/content/

[sebgoa]

Author: sebgoa
Date: Tue Sep 16 11:42:26 2014
New Revision: 922381

Log:
Publishing svnmucc operation to cloudstack site by sebgoa

Added:
websites/production/cloudstack/content/
  - copied from r922380, websites/staging/cloudstack/trunk/content/

git commit: updated refs/heads/4.3 to 063bb8f

[sebgoa]

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 c45f73cc2 -> 063bb8f5b


Updating pom.xml version numbers for release 4.3.2-SNAPSHOT

Signed-off-by: Sebastien Goasguen 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/063bb8f5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/063bb8f5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/063bb8f5

Branch: refs/heads/4.3
Commit: 063bb8f5b482bf2f5f05335c21c2415e779695b9
Parents: c45f73c
Author: Sebastien Goasguen 
Authored: Tue Sep 16 09:06:36 2014 -0400
Committer: Sebastien Goasguen 
Committed: Tue Sep 16 09:16:47 2014 -0400

--
 agent/pom.xml | 2 +-
 api/pom.xml   | 2 +-
 awsapi/pom.xml| 2 +-
 client/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 debian/changelog  | 6 ++
 deps/XenServerJava/pom.xml| 2 +-
 developer/pom.xml | 2 +-
 engine/api/pom.xml| 2 +-
 engine/components-api/pom.xml | 2 +-
 engine/network/pom.xml| 2 +-
 engine/orchestration/pom.xml  | 2 +-
 engine/pom.xml| 2 +-
 engine/schema/pom.xml | 2 +-
 engine/service/pom.xml| 2 +-
 engine/storage/cache/pom.xml  | 2 +-
 engine/storage/datamotion/pom.xml | 2 +-
 engine/storage/image/pom.xml  | 2 +-
 engine/storage/integration-test/pom.xml   | 2 +-
 engine/storage/pom.xml| 2 +-
 engine/storage/snapshot/pom.xml   | 2 +-
 engine/storage/volume/pom.xml | 2 +-
 framework/cluster/pom.xml | 2 +-
 framework/config/pom.xml  | 2 +-
 framework/db/pom.xml  | 2 +-
 framework/events/pom.xml  | 2 +-
 framework/ipc/pom.xml | 2 +-
 framework/jobs/pom.xml| 2 +-
 framework/managed-context/pom.xml | 2 +-
 framework/pom.xml | 2 +-
 framework/rest/pom.xml| 2 +-
 framework/spring/lifecycle/pom.xml| 2 +-
 framework/spring/module/pom.xml   | 2 +-
 maven-standard/pom.xml| 2 +-
 parents/checkstyle/pom.xml| 2 +-
 plugins/acl/static-role-based/pom.xml | 2 +-
 plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
 plugins/affinity-group-processors/host-anti-affinity/pom.xml  | 2 +-
 plugins/alert-handlers/snmp-alerts/pom.xml| 2 +-
 plugins/alert-handlers/syslog-alerts/pom.xml  | 2 +-
 plugins/api/discovery/pom.xml | 2 +-
 plugins/api/rate-limit/pom.xml| 2 +-
 plugins/database/mysql-ha/pom.xml | 2 +-
 plugins/dedicated-resources/pom.xml   | 2 +-
 plugins/deployment-planners/implicit-dedication/pom.xml   | 2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +-
 plugins/deployment-planners/user-dispersing/pom.xml   | 2 +-
 plugins/event-bus/rabbitmq/pom.xml| 2 +-
 plugins/file-systems/netapp/pom.xml   | 2 +-
 plugins/ha-planners/skip-heurestics/pom.xml   | 2 +-
 plugins/host-allocators/random/pom.xml| 2 +-
 plugins/hypervisors/baremetal/pom.xml | 2 +-
 plugins/hypervisors/hyperv/pom.xml| 2 +-
 plugins/hypervisors/kvm/pom.xml   | 2 +-
 plugins/hypervisors/ovm/pom.xml   | 2 +-
 plugins/hypervisors/simulator/pom.xml | 2 +-
 plugins/hypervisors/ucs/pom.xml   | 4 ++--
 plugins/hypervisors/vmware/pom.xml| 2 +-
 plugins/hypervisors/xen/pom.xml   | 2 +-
 plugins/network-elements/bigswitch-vns/pom.xml| 2 +-
 plugins/network-elements/cisc

git commit: updated refs/heads/master to ba93200

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/master 2648912af -> ba9320091


Seperate test execution on travis out to make full use of the ability to run 5 
concurrent jobs.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba932009
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba932009
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba932009

Branch: refs/heads/master
Commit: ba93200917cc54317010c5f54c00fcfb5a5f9d23
Parents: 2648912
Author: imduffy15 
Authored: Tue Sep 16 14:31:37 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 14:31:37 2014 +0100

--
 .travis.yml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba932009/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index bc9b713..cb07a68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,11 @@ jdk:
 notifications:
   email: false
 env:
-- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range test_iso 
test_multipleips_per_nic test_network test_non_contigiousvlan 
test_over_provisioning"
+- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners 
test_disk_offerings test_global_settings test_guest_vlan_range test_iso"
 - TESTS="test_portable_publicip test_primary_storage test_privategw_acl 
test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot 
test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm 
test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn"
+- TESTS="test_secondary_storage test_service_offerings test_ssvm 
test_templates"
+- TESTS="test_multipleips_per_nic test_network test_non_contigiousvlan 
test_over_provisioning"
+- TESTS="test_volumes test_vpc_vpn misc/test_deploy_vm test_vm_life_cycle"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh

git commit: updated refs/heads/bugfix/CID-1212198 to 008e0e3

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1212198 [created] 008e0e380


CID-1212198: remove unused assignment


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/008e0e38
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/008e0e38
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/008e0e38

Branch: refs/heads/bugfix/CID-1212198
Commit: 008e0e3806cb6367267cf32148fae0350db08c61
Parents: ba93200
Author: imduffy15 
Authored: Tue Sep 16 14:41:25 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 14:41:25 2014 +0100

--
 .../hypervisor/hyperv/resource/HypervDirectConnectResource.java   | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/008e0e38/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
--
diff --git 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index d0f526f..f0260b2 100644
--- 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -1914,9 +1914,6 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
 s_logger.debug("executeRequest received response "
 + s_gson.toJson(result));
-if (result.length > 0) {
-ModifyVmNicConfigAnswer ans = ((ModifyVmNicConfigAnswer)result[0]);
-}
 }
 
 protected void assignPublicIpAddress(final String vmName, final String 
privateIpAddress, final String publicIpAddress, final boolean add, final 
boolean firstIP,

Git Push Summary

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1225202 [deleted] 46158772e

Git Push Summary

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1232342 [deleted] 2fad1095b

git commit: updated refs/heads/bugfix/CID-1222206 to 93c7242

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-106 [created] 93c724229


CID-106 Simplify isDmcEnabled.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93c72422
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93c72422
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93c72422

Branch: refs/heads/bugfix/CID-106
Commit: 93c72422983947a624cf43ff72371434cc081ec4
Parents: ba93200
Author: imduffy15 
Authored: Tue Sep 16 14:49:52 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 14:49:52 2014 +0100

--
 .../xenserver/resource/XenServer56FP1Resource.java   | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c72422/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
index a119f48..a45abee 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
@@ -119,11 +119,7 @@ public class XenServer56FP1Resource extends 
XenServer56Resource {
  */
 @Override
 protected boolean isDmcEnabled(Connection conn, Host host) throws 
XenAPIException, XmlRpcException {
-Map hostParams = new HashMap();
-hostParams = host.getLicenseParams(conn);
-
-Boolean isDmcEnabled = 
hostParams.get("restrict_dmc").equalsIgnoreCase("false");
-
-return isDmcEnabled;
+Map hostParams = host.getLicenseParams(conn);
+return hostParams.get("restrict_dmc").equalsIgnoreCase("false");
 }
 }

git commit: updated refs/heads/bugfix/CID-1192810 to 38f8ca7

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1192810 [created] 38f8ca770


CID-1192810: Remove useless control flow


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38f8ca77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38f8ca77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38f8ca77

Branch: refs/heads/bugfix/CID-1192810
Commit: 38f8ca770641140dcf5ad3e15b344171b38bf82f
Parents: ba93200
Author: imduffy15 
Authored: Tue Sep 16 14:52:30 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 14:52:30 2014 +0100

--
 server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38f8ca77/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
--
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java 
b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 9eaef1e..ca66403 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -512,8 +512,6 @@ StateListener {
 public DeploymentPlanner getDeploymentPlannerByName(String plannerName) {
 if (plannerName != null) {
 for (DeploymentPlanner plannerInList : _planners) {
-if (plannerName != null) {
-}
 if (plannerName.equalsIgnoreCase(plannerInList.getName())) {
 return plannerInList;
 }

git commit: updated refs/heads/bugfix/CID-1116850 to d9560c5

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1116850 [created] d9560c520


CID-1116850: Remove dead local store.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9560c52
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9560c52
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9560c52

Branch: refs/heads/bugfix/CID-1116850
Commit: d9560c52087889602b926ba6e9dbfeb284d42d59
Parents: 38f8ca7
Author: imduffy15 
Authored: Tue Sep 16 14:58:51 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 14:58:51 2014 +0100

--
 .../cloudstack/storage/motion/AncientDataMotionStrategy.java | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9560c52/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
--
diff --git 
a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
 
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 5b01f95..32b70f3 100644
--- 
a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ 
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -111,10 +111,6 @@ public class AncientDataMotionStrategy implements 
DataMotionStrategy {
 return false;
 }
 
-if (srcData.getType() == DataObjectType.TEMPLATE) {
-TemplateInfo template = (TemplateInfo)srcData;
-}
-
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("needCacheStorage true, dest at " + 
destTO.getPath() + " dest role " + destStoreTO.getRole().toString() + 
srcTO.getPath() + " src role " +
 srcStoreTO.getRole().toString());

git commit: updated refs/heads/bugfix/CID-1192805 to d7850d5

[duffy]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-1192805 [created] d7850d518


CID-1192805: Fix dead local store.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7850d51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7850d51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7850d51

Branch: refs/heads/bugfix/CID-1192805
Commit: d7850d518c7fdfeebf6ca139e802cc699cd8a6f7
Parents: d9560c5
Author: imduffy15 
Authored: Tue Sep 16 15:11:13 2014 +0100
Committer: imduffy15 
Committed: Tue Sep 16 15:11:13 2014 +0100

--
 .../ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7850d51/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
--
diff --git 
a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
 
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
index 820cd55..7f86f3a 100644
--- 
a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
+++ 
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -95,8 +95,7 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase 
implements OvsNetwor
 List vpcNetworks =  _vpcMgr.getVpcNetworks(vpcId);
 List vpcHostIds = new ArrayList<>();
 for (Network vpcNetwork : vpcNetworks) {
-List networkHostIds = new ArrayList();
-networkHostIds = getNetworkSpanedHosts(vpcNetwork.getId());
+List networkHostIds = 
getNetworkSpanedHosts(vpcNetwork.getId());
 if (networkHostIds != null && !networkHostIds.isEmpty()) {
 for (Long hostId : networkHostIds) {
 if (!vpcHostIds.contains(hostId)) {

git commit: updated refs/heads/bugfix/CID-116538 to de26a72

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/CID-116538 1760a60eb -> de26a7228 (forced update)


Fix resource leaks on exception paths

Make it clear that the server socket isn't a leaked resource


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de26a722
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de26a722
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de26a722

Branch: refs/heads/bugfix/CID-116538
Commit: de26a7228e1298d0a5d4d2c0bf00c924a99cd505
Parents: 50990c4
Author: Hugo Trippaers 
Authored: Tue Sep 16 09:27:05 2014 +0200
Committer: Hugo Trippaers 
Committed: Tue Sep 16 16:43:32 2014 +0200

--
 utils/src/com/cloud/utils/nio/Link.java  |  7 +++--
 utils/src/com/cloud/utils/nio/NioClient.java | 36 ---
 utils/src/com/cloud/utils/nio/NioServer.java | 18 +---
 3 files changed, 31 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de26a722/utils/src/com/cloud/utils/nio/Link.java
--
diff --git a/utils/src/com/cloud/utils/nio/Link.java 
b/utils/src/com/cloud/utils/nio/Link.java
index 36a8e60..e4291d0 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -31,6 +31,7 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
+import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -159,7 +160,7 @@ public class Link {
 pkgBuf.clear();
 engResult = sslEngine.wrap(buffers, pkgBuf);
 if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED && 
engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
-engResult.getStatus() != SSLEngineResult.Status.OK) {
+engResult.getStatus() != SSLEngineResult.Status.OK) {
 throw new IOException("SSL: SSLEngine return bad result! " + 
engResult);
 }
 
@@ -285,7 +286,7 @@ public class Link {
 appBuf = ByteBuffer.allocate(sslSession.getApplicationBufferSize() 
+ 40);
 engResult = _sslEngine.unwrap(_readBuffer, appBuf);
 if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED && 
engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
-engResult.getStatus() != SSLEngineResult.Status.OK) {
+engResult.getStatus() != SSLEngineResult.Status.OK) {
 throw new IOException("SSL: SSLEngine return bad result! " + 
engResult);
 }
 if (remaining == _readBuffer.remaining()) {
@@ -405,7 +406,7 @@ public class Link {
 _connection.scheduleTask(task);
 }
 
-public static SSLContext initSSLContext(boolean isClient) throws Exception 
{
+public static SSLContext initSSLContext(boolean isClient) throws 
GeneralSecurityException, IOException {
 InputStream stream;
 SSLContext sslContext = null;
 KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de26a722/utils/src/com/cloud/utils/nio/NioClient.java
--
diff --git a/utils/src/com/cloud/utils/nio/NioClient.java 
b/utils/src/com/cloud/utils/nio/NioClient.java
index 34d03c2..f4b1029 100755
--- a/utils/src/com/cloud/utils/nio/NioClient.java
+++ b/utils/src/com/cloud/utils/nio/NioClient.java
@@ -24,6 +24,7 @@ import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
+import java.security.GeneralSecurityException;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -48,30 +49,23 @@ public class NioClient extends NioConnection {
 @Override
 protected void init() throws IOException {
 _selector = Selector.open();
-SocketChannel sch = null;
-InetSocketAddress addr = null;
+Task task = null;
 
-try {
-sch = SocketChannel.open();
+try (SocketChannel sch = SocketChannel.open()) {
 sch.configureBlocking(true);
 s_logger.info("Connecting to " + _host + ":" + _port);
 
 if (_bindAddress != null) {
 s_logger.info("Binding outbound interface at " + _bindAddress);
 
-addr = new InetSocketAddress(_bindAddress, 0);
-sch.socket().bind(addr);
+InetSocketAddress bindAddr = new 
InetSocketAddress(_bindAddress, 

git commit: updated refs/heads/master to 88c6072

[bhaisaab]

Repository: cloudstack
Updated Branches:
  refs/heads/master ba9320091 -> 88c6072b4


CID-1237196: Fix potential NPE in SAMLUtils

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/88c6072b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/88c6072b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/88c6072b

Branch: refs/heads/master
Commit: 88c6072b4dd4d4bdea196e915a8c7b2bb27feba0
Parents: ba93200
Author: Rohit Yadav 
Authored: Tue Sep 16 17:10:11 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 16 17:10:11 2014 +0200

--
 utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88c6072b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
--
diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java 
b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
index b08fa24..36c4d0f 100644
--- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
@@ -225,7 +225,11 @@ public class SAMLUtils {
 Signature signature = Signature.getInstance("SHA1withRSA");
 signature.initSign(signingKey);
 signature.update(url.getBytes());
-return url + "&Signature=" + 
URLEncoder.encode(Base64.encodeBytes(signature.sign(), 
Base64.DONT_BREAK_LINES), HttpUtils.UTF_8);
+String signatureString = Base64.encodeBytes(signature.sign(), 
Base64.DONT_BREAK_LINES);
+if (signatureString != null) {
+return url + "&Signature=" + URLEncoder.encode(signatureString, 
HttpUtils.UTF_8);
+}
+return url;
 }
 
 public static KeyFactory getKeyFactory() {

git commit: updated refs/heads/master to fbbd2f8

[bhaisaab]

Repository: cloudstack
Updated Branches:
  refs/heads/master 88c6072b4 -> fbbd2f893


CID-1233088: In case there is no GSLB SP, throw cloud exception

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fbbd2f89
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbbd2f89
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbbd2f89

Branch: refs/heads/master
Commit: fbbd2f89322b1380956c269dcf6cd6b6b6b48410
Parents: 88c6072
Author: Rohit Yadav 
Authored: Tue Sep 16 17:17:11 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 16 17:17:11 2014 +0200

--
 .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbbd2f89/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
--
diff --git 
a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
 
b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
index 1d2c62b..6595e3f 100644
--- 
a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
+++ 
b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
@@ -687,7 +687,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements 
GlobalLoadBalancingR
 
 try {
 
lookupGslbServiceProvider().applyGlobalLoadBalancerRule(zoneId.first(), 
zoneId.second(), gslbConfigCmd);
-} catch (ResourceUnavailableException e) {
+} catch (ResourceUnavailableException | NullPointerException e) {
 String msg = "Failed to configure GSLB rule in the zone " + 
zoneId.first() + " due to " + e.getMessage();
 s_logger.warn(msg);
 throw new CloudRuntimeException(msg);

[2/2] git commit: updated refs/heads/4.4 to d04f59a

[dahn]

CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d04f59a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d04f59a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d04f59a3

Branch: refs/heads/4.4
Commit: d04f59a30d130dbb83f162af6e67334fe2c9cef0
Parents: 4d065b9
Author: Daan Hoogland 
Authored: Wed Sep 10 11:46:46 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 17:16:23 2014 +0200

--
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d04f59a3/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
--
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh 
b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 88f4841..b4ef56e 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -109,4 +109,4 @@ do
 done
 
 /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date 
+%s) - $lastdate)) seconds, rebooting system!"
-reboot -f
+echo b > /proc/sysrq-trigger
\ No newline at end of file

[1/2] git commit: updated refs/heads/4.4 to d04f59a

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 528ac4c6e -> d04f59a30


CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d065b9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d065b9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d065b9a

Branch: refs/heads/4.4
Commit: 4d065b9a3a336d59902c266202c1094509c007d2
Parents: 528ac4c
Author: Daan Hoogland 
Authored: Tue Sep 9 22:19:54 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 12:25:07 2014 +0200

--
 .../hypervisor/xen/discoverer/XcpServerDiscoverer.java  |  1 +
 .../hypervisor/xen/resource/CitrixResourceBase.java |  8 ++--
 scripts/vm/hypervisor/xenserver/launch_hb.sh|  7 ++-
 scripts/vm/hypervisor/xenserver/vmopspremium|  3 ++-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 12 
 server/src/com/cloud/configuration/Config.java  | 10 +-
 .../cloud/configuration/ConfigurationManagerImpl.java   |  1 +
 server/src/com/cloud/resource/DiscovererBase.java   |  1 +
 .../root/redundant_router/check_heartbeat.sh.templ  |  4 ++--
 9 files changed, 36 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 0e7cf74..eda28f3 100755
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -347,6 +347,7 @@ public class XcpServerDiscoverer extends DiscovererBase 
implements Discoverer, L
 details.put("wait", Integer.toString(_wait));
 params.put("migratewait", 
_configDao.getValue(Config.MigrateWait.toString()));
 params.put(Config.XenMaxNics.toString().toLowerCase(), 
_configDao.getValue(Config.XenMaxNics.toString()));
+
params.put(Config.XenHeartBeatTimeout.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatTimeout.toString()));
 
params.put(Config.XenHeartBeatInterval.toString().toLowerCase(), 
_configDao.getValue(Config.XenHeartBeatInterval.toString()));
 params.put(Config.InstanceName.toString().toLowerCase(), 
_instance);
 details.put(Config.InstanceName.toString().toLowerCase(), 
_instance);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d065b9a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index c1c9795..644ef65 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -289,6 +289,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 protected IAgentControl _agentControl;
 
 final int _maxWeight = 256;
+protected int _heartbeatTimeout = 120;
 protected int _heartbeatInterval = 60;
 protected final XsHost _host = new XsHost();
 
@@ -4603,8 +4604,10 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 
 protected boolean launchHeartBeat(Connection conn) {
-String result = callHostPluginPremium(conn, "heartbeat", "host", 
_host.uuid, "interval", Integer
-.toString(_heartbeatInterval));
+String result = callHostPluginPremium(conn, "heartbeat",
+"host", _host.uuid,
+"timeout", Integer.toString(_heartbeatTimeout),
+"interval", Integer.toString(_heartbeatInterval));
 if (result == null || !result.contains("> DONE <")) {
 s_logger.warn("Unable to launch the heartbeat process on " + 
_host.ip);
 return false;
@@ -5674,6 +5677,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 _storageNetworkName1 = (String)params.get("storage.network.device1");
 _storageNetworkName2 = (String)params.get("storage.network.device2");
 
+_heartbeatTimeout = 
NumbersUtil.parseInt((String)params.get("xen.heartbeat.timeout"),

git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to d04f59a

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/hotfix/4.4/CLOUDSTACK-7184 b82f27be4 -> d04f59a30 (forced update)


CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d04f59a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d04f59a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d04f59a3

Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: d04f59a30d130dbb83f162af6e67334fe2c9cef0
Parents: 4d065b9
Author: Daan Hoogland 
Authored: Wed Sep 10 11:46:46 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Sep 16 17:16:23 2014 +0200

--
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d04f59a3/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
--
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh 
b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 88f4841..b4ef56e 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -109,4 +109,4 @@ do
 done
 
 /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date 
+%s) - $lastdate)) seconds, rebooting system!"
-reboot -f
+echo b > /proc/sysrq-trigger
\ No newline at end of file

git commit: updated refs/heads/master to a1e8d5e

[bhaisaab]

Repository: cloudstack
Updated Branches:
  refs/heads/master fbbd2f893 -> a1e8d5eef


CID-1233087: In case of no virtual routers, fail early

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1e8d5ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1e8d5ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1e8d5ee

Branch: refs/heads/master
Commit: a1e8d5eefbbdf1398eba43b3078ef6e35ded7b71
Parents: fbbd2f8
Author: Rohit Yadav 
Authored: Tue Sep 16 17:27:32 2014 +0200
Committer: Rohit Yadav 
Committed: Tue Sep 16 17:27:32 2014 +0200

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e8d5ee/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 8f6699e..b3252db 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2530,6 +2530,9 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (requiredOfferings.get(0).getState() == 
NetworkOffering.State.Enabled) {
 // get Virtual networks
 List virtualNetworks = 
_networkModel.listNetworksForAccount(owner.getId(), zone.getId(), 
Network.GuestType.Isolated);
+if (virtualNetworks == null) {
+throw new InvalidParameterValueException("No (virtual) 
networks are found for account " + owner);
+}
 if (virtualNetworks.isEmpty()) {
 long physicalNetworkId = 
_networkModel.findPhysicalNetworkId(zone.getId(), 
requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType());
 // Validate physical network

git commit: updated refs/heads/master to 75d0197

[kishan]

Repository: cloudstack
Updated Branches:
  refs/heads/master a1e8d5eef -> 75d01971e


CLOUDSTACK-7546: cloudstack-setup-agent considers distro as RHEL5 if no 
conditions match. Add check to identify RHEL7 distro and consider it as RHEL6. 
If there is anything specific required for RHEL7, it can be added later


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/75d01971
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75d01971
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75d01971

Branch: refs/heads/master
Commit: 75d01971e8d5f27f65ba0b98fc6d9aba057757e7
Parents: a1e8d5e
Author: Kishan Kavala 
Authored: Tue Sep 16 20:59:37 2014 +0530
Committer: Kishan Kavala 
Committed: Tue Sep 16 21:03:01 2014 +0530

--
 python/lib/cloudutils/utilities.py | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75d01971/python/lib/cloudutils/utilities.py
--
diff --git a/python/lib/cloudutils/utilities.py 
b/python/lib/cloudutils/utilities.py
index f7f25f4..ea0384b 100755
--- a/python/lib/cloudutils/utilities.py
+++ b/python/lib/cloudutils/utilities.py
@@ -112,6 +112,8 @@ class Distribution:
 version = file("/etc/redhat-release").readline()
 if version.find("Red Hat Enterprise Linux Server release 6") != -1 
or version.find("Scientific Linux release 6") != -1 or version.find("CentOS 
Linux release 6") != -1 or version.find("CentOS release 6.") != -1:
 self.distro = "RHEL6"
+elif version.find("Red Hat Enterprise Linux Server release 7") != 
-1:
+self.distro = "RHEL6"
 elif version.find("CentOS release") != -1:
 self.distro = "CentOS"
 else:

git commit: updated refs/heads/master to 1b15efb

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/master 75d01971e -> 1b15efb5f


CLOUDSTACK-7563: ClassCastException in VirtualMachineManagerImpl in
handling various Agent command answer.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b15efb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b15efb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b15efb5

Branch: refs/heads/master
Commit: 1b15efb5f018f473a680165fff0d5574b8e771e5
Parents: 75d0197
Author: Min Chen 
Authored: Tue Sep 16 12:01:26 2014 -0700
Committer: Min Chen 
Committed: Tue Sep 16 12:12:17 2014 -0700

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 70 +++-
 1 file changed, 39 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b15efb5/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index f7adcf8..5de1e51 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -79,12 +79,10 @@ import com.cloud.agent.api.CheckVirtualMachineCommand;
 import com.cloud.agent.api.ClusterVMMetaDataSyncAnswer;
 import com.cloud.agent.api.ClusterVMMetaDataSyncCommand;
 import com.cloud.agent.api.Command;
-import com.cloud.agent.api.MigrateAnswer;
 import com.cloud.agent.api.MigrateCommand;
 import com.cloud.agent.api.PingRoutingCommand;
 import com.cloud.agent.api.PlugNicAnswer;
 import com.cloud.agent.api.PlugNicCommand;
-import com.cloud.agent.api.PrepareForMigrationAnswer;
 import com.cloud.agent.api.PrepareForMigrationCommand;
 import com.cloud.agent.api.RebootAnswer;
 import com.cloud.agent.api.RebootCommand;
@@ -1038,11 +1036,11 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 
 StopCommand cmd = new StopCommand(vm, 
getExecuteInSequence(vm.getHypervisorType()), false);
-StopAnswer answer = (StopAnswer) 
_agentMgr.easySend(destHostId, cmd);
-if ( answer != null ) {
-
+Answer answer = _agentMgr.easySend(destHostId, 
cmd);
+if (answer != null && answer instanceof 
StopAnswer) {
+StopAnswer stopAns = (StopAnswer)answer;
 if (vm.getType() == VirtualMachine.Type.User) {
-String platform = answer.getPlatform();
+String platform = stopAns.getPlatform();
 if (platform != null) {
 Map vmmetadata = new 
HashMap();
 vmmetadata.put(vm.getInstanceName(), 
platform);
@@ -1219,10 +1217,11 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 VirtualMachine vm = profile.getVirtualMachine();
 StopCommand stop = new StopCommand(vm, 
getExecuteInSequence(vm.getHypervisorType()), checkBeforeCleanup);
 try {
-StopAnswer answer = (StopAnswer)_agentMgr.send(vm.getHostId(), 
stop);
-if (answer != null) {
+Answer answer = _agentMgr.send(vm.getHostId(), stop);
+if (answer != null && answer instanceof StopAnswer) {
+StopAnswer stopAns = (StopAnswer)answer;
 if (vm.getType() == VirtualMachine.Type.User) {
-String platform = answer.getPlatform();
+String platform = stopAns.getPlatform();
 if (platform != null) {
 UserVmVO userVm = _userVmDao.findById(vm.getId());
 _userVmDao.loadDetails(userVm);
@@ -1235,7 +1234,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 if (gpuDevice != null) {
 _resourceMgr.updateGPUDetails(vm.getHostId(), 
gpuDevice.getGroupDetails());
 }
-if (!answer.getResult()) {
+if (answer == null || !answer.getResult()) {
 s_logger.debug("Unable to stop VM due to " + 
answer.getDetails());
 return false;
 }
@@ -1481,17 +1480,20 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 StopCommand stop = new StopCommand(vm, 
getExecuteInSequence(vm.getHypervisorType()), false);
 
 boolean stopped = false;
-

git commit: updated refs/heads/master to d0da107

[jessicawang]

Repository: cloudstack
Updated Branches:
  refs/heads/master 1b15efb5f -> d0da107b7


CLOUDSTACK-7497: UI > VM Wizard > select template > reset local variable before 
retrieving selected template object.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0da107b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0da107b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0da107b

Branch: refs/heads/master
Commit: d0da107b7ff20512b2ea18bbd4bb7fa09e533eb2
Parents: 1b15efb
Author: Jessica Wang 
Authored: Tue Sep 16 13:20:48 2014 -0700
Committer: Jessica Wang 
Committed: Tue Sep 16 13:21:01 2014 -0700

--
 ui/scripts/instanceWizard.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0da107b/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 97a039b..2a79ef0 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -265,6 +265,7 @@
 
 // Step 3: Service offering
 function(args) {
+   selectedTemplateObj = null; //reset 
 if (args.currentData["select-template"] == "select-template") {
 if (featuredTemplateObjs != null && 
featuredTemplateObjs.length > 0) {
 for (var i = 0; i < featuredTemplateObjs.length; i++) {

git commit: updated refs/heads/master to cb45133

[anthonyxu]

Repository: cloudstack
Updated Branches:
  refs/heads/master d0da107b7 -> cb4513379


for windows guest OS, configure gateway for each nic


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb451337
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb451337
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb451337

Branch: refs/heads/master
Commit: cb4513379996b262ae378daf00c6388c6b7313cf
Parents: d0da107
Author: Anthony Xu 
Authored: Tue Sep 16 14:31:07 2014 -0700
Committer: Anthony Xu 
Committed: Tue Sep 16 14:33:22 2014 -0700

--
 .../router/VirtualNetworkApplianceManagerImpl.java   | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb451337/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 0248412..c95867e 100755
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -180,6 +180,7 @@ import com.cloud.resource.ResourceManager;
 import com.cloud.server.ConfigurationServer;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.Storage.ProvisioningType;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
@@ -3656,10 +3657,12 @@ VirtualMachineGuru, Listener, Configurable, 
StateListener

git commit: updated refs/heads/master to a2d85c8

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/master cb4513379 -> a2d85c8ca


CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud is
unusable.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2d85c8c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2d85c8c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2d85c8c

Branch: refs/heads/master
Commit: a2d85c8cae5f603bbcfcd3659c1207f0bfe461a7
Parents: cb45133
Author: Min Chen 
Authored: Tue Sep 16 15:14:08 2014 -0700
Committer: Min Chen 
Committed: Tue Sep 16 15:14:08 2014 -0700

--
 .../framework/messagebus/MessageBusBase.java| 37 
 .../jobs/impl/AsyncJobManagerImpl.java  | 13 +++
 2 files changed, 44 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2d85c8c/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
--
diff --git 
a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
 
b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
index 9432da0..e8f9bce 100644
--- 
a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
+++ 
b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
@@ -26,6 +26,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 
 public class MessageBusBase implements MessageBus {
@@ -36,6 +38,8 @@ public class MessageBusBase implements MessageBus {
 private final SubscriptionNode _subscriberRoot;
 private MessageSerializer _messageSerializer;
 
+private static final Logger s_logger = 
Logger.getLogger(MessageBusBase.class);
+
 public MessageBusBase() {
 _gate = new Gate();
 _pendingActions = new ArrayList();
@@ -58,6 +62,9 @@ public class MessageBusBase implements MessageBus {
 assert (subject != null);
 assert (subscriber != null);
 if (_gate.enter()) {
+if (s_logger.isTraceEnabled()) {
+s_logger.trace("Enter gate in message bus subscribe");
+}
 try {
 SubscriptionNode current = locate(subject, null, true);
 assert (current != null);
@@ -75,6 +82,9 @@ public class MessageBusBase implements MessageBus {
 @Override
 public void unsubscribe(String subject, MessageSubscriber subscriber) {
 if (_gate.enter()) {
+if (s_logger.isTraceEnabled()) {
+s_logger.trace("Enter gate in message bus unsubscribe");
+}
 try {
 if (subject != null) {
 SubscriptionNode current = locate(subject, null, false);
@@ -96,6 +106,9 @@ public class MessageBusBase implements MessageBus {
 @Override
 public void clearAll() {
 if (_gate.enter()) {
+if (s_logger.isTraceEnabled()) {
+s_logger.trace("Enter gate in message bus clearAll");
+}
 try {
 _subscriberRoot.clearAll();
 doPrune();
@@ -112,6 +125,9 @@ public class MessageBusBase implements MessageBus {
 @Override
 public void prune() {
 if (_gate.enter()) {
+if (s_logger.isTraceEnabled()) {
+s_logger.trace("Enter gate in message bus prune");
+}
 try {
 doPrune();
 } finally {
@@ -144,6 +160,9 @@ public class MessageBusBase implements MessageBus {
 public void publish(String senderAddress, String subject, PublishScope 
scope, Object args) {
 
 if (_gate.enter(true)) {
+if (s_logger.isTraceEnabled()) {
+s_logger.trace("Enter gate in message bus publish");
+}
 try {
 List chainFromTop = new 
ArrayList();
 SubscriptionNode current = locate(subject, chainFromTop, 
false);
@@ -309,14 +328,20 @@ public class MessageBusBase implements MessageBus {
 public void leave() {
 synchronized (this) {
 if (_reentranceCount > 0) {
-assert (_gateOwner == Thread.currentThread());
+try {
+assert (_gateOwner == Thread.currentThread());
 
-onGateOpen();
-_reentranceCount--;
-assert (_reentranceCount == 0);
-_gateOwner = null;
+onGateOpen();
+} finally {
+if (s_logger.isTraceEnabled()) {
+   

[1/3] CLOUDSTACK-7551 - Automate ACL test cases relating to impersonation when depoying VM in shared network

[sangeethah]

Repository: cloudstack
Updated Branches:
  refs/heads/master a2d85c8ca -> 65608e994


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65608e99/tools/marvin/marvin/cloudstackException.py
--
diff --git a/tools/marvin/marvin/cloudstackException.py 
b/tools/marvin/marvin/cloudstackException.py
index 331ae91..2738cfb 100644
--- a/tools/marvin/marvin/cloudstackException.py
+++ b/tools/marvin/marvin/cloudstackException.py
@@ -71,6 +71,7 @@ class CloudstackAclException():
 NO_PERMISSION_TO_OPERATE_ACCOUNT = "does not have permission to operate 
with resource Acct"
 UNABLE_TO_LIST_NETWORK_ACCOUNT = "Can't create/list resources for account"
 NO_PERMISSION_TO_ACCESS_ACCOUNT = "does not have permission to access 
resource Acct"
+NOT_AVAILABLE_IN_DOMAIN = "not available in domain"
 
 @staticmethod
 def verifyMsginException(e,message):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65608e99/tools/marvin/marvin/config/test_data.py
--
diff --git a/tools/marvin/marvin/config/test_data.py 
b/tools/marvin/marvin/config/test_data.py
index 4133aba..9b2aee7 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1215,10 +1215,18 @@ test_data = {
 "name" : "d11b",
 "displayname" : "d11b",
 },
+"vmD111" : {
+"name" : "d111",
+"displayname" : "d111",
+},
 "vmD111A" : {
 "name" : "d111a",
 "displayname" : "d111a",
 },
+"vmD111B" : {
+"name" : "d111b",
+"displayname" : "d111b",
+},
 "vmD12A" : {
 "name" : "d12a",
 "displayname" : "d12a",

[3/3] git commit: updated refs/heads/master to 65608e9

[sangeethah]

CLOUDSTACK-7551 - Automate ACL test cases relating to impersonation when 
depoying VM in shared network


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65608e99
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65608e99
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65608e99

Branch: refs/heads/master
Commit: 65608e99495007183bb8e4043b0f1efe527a7e85
Parents: a2d85c8
Author: Sangeetha Hariharan 
Authored: Mon Sep 15 17:12:06 2014 -0700
Committer: Sangeetha Hariharan 
Committed: Tue Sep 16 18:45:58 2014 -0700

--
 ..._acl_sharednetwork_deployVM-impersonation.py | 1824 ++
 tools/marvin/marvin/cloudstackException.py  |1 +
 tools/marvin/marvin/config/test_data.py |8 +
 3 files changed, 1833 insertions(+)
--

[2/3] CLOUDSTACK-7551 - Automate ACL test cases relating to impersonation when depoying VM in shared network

[sangeethah]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65608e99/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py
--
diff --git 
a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py 
b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py
new file mode 100644
index 000..fba3d33
--- /dev/null
+++ 
b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py
@@ -0,0 +1,1824 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""
+ Test cases for deploying Virtual Machine using impersonation (passing account 
and domainId parameters) for shared network 
+"""
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from marvin.cloudstackException import CloudstackAclException
+from nose.plugins.attrib import attr
+#Import System modules
+import time
+
+_multiprocess_shared_ = True
+
+class TestSharedNetworkImpersonation(cloudstackTestCase):
+
+@classmethod
+def setUpClass(cls):
+
+"""
+Create the following domain tree and accounts that are reqiured for 
executing impersonation test cases for shared networks:
+Under ROOT - create 2 domaind D1 and D2
+Under D1 - Create 2 subdomain D11 and D12
+Under D11 - Create subdimain D111
+
+Under each of the domain create 1 admin user and couple of regular 
users.
+
+Create shared network with the following scope:
+1. Network with scope="all"
+2. Network with scope="domain" with no subdomain access
+3. Network with scope="domain" with subdomain access
+4. Network with scope="account"
+
+"""
+
+   cls.testclient = super(TestSharedNetworkImpersonation, 
cls).getClsTestClient()
+cls.apiclient = cls.testclient.getApiClient()
+   cls.testdata = cls.testClient.getParsedTestDataConfig()
+   cls.acldata = cls.testdata["acl"]
+
+   cls.domain_1 = None
+   cls.domain_2 = None
+   cleanup = []
+
+   try:
+# backup default apikey and secretkey
+cls.default_apikey = cls.apiclient.connection.apiKey
+cls.default_secretkey = cls.apiclient.connection.securityKey
+   
+# Create domains 
+cls.domain_1 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain1"]
+   )
+cls.domain_11 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain11"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_111 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain111"],
+  parentdomainid=cls.domain_11.id,
+   )
+cls.domain_12 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain12"],
+  parentdomainid=cls.domain_1.id
+   )
+cls.domain_2 = Domain.create(
+   cls.apiclient,
+   cls.acldata["domain2"]
+   )
+# Create  1 admin account and 2 user accounts for doamin_1
+cls.account_d1 = Account.create(
+cls.apiclient,
+cls.acldata["accountD1"],
+admin=True,
+domainid=cls.domain_1.id
+)
+
+   user = cls.generateKeysForUser(cls.apiclient,cls.account_d1)
+cls.user_d1_apikey = user.apikey
+cls.user_d1_secretkey = user.secretkey
+
+cls.ac

[3/3] git commit: updated refs/heads/pytest to 797fff1

[edison]

add parallel in xdist


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/797fff16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/797fff16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/797fff16

Branch: refs/heads/pytest
Commit: 797fff165e7c04d571fff2bbcda59fb94688e108
Parents: 145542d
Author: Edison Su 
Authored: Tue Sep 16 18:05:54 2014 -0700
Committer: Edison Su 
Committed: Tue Sep 16 18:05:54 2014 -0700

--
 test/integration/smoke/test_CS-18306.py | 12 +--
 tools/marvin/marvin/pytest/VM.py|  2 +-
 tools/pytest-xdist/xdist/dsession.py| 51 
 tools/pytest-xdist/xdist/remote.py  | 11 +-
 4 files changed, 42 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/797fff16/test/integration/smoke/test_CS-18306.py
--
diff --git a/test/integration/smoke/test_CS-18306.py 
b/test/integration/smoke/test_CS-18306.py
index cb555ee..072da93 100644
--- a/test/integration/smoke/test_CS-18306.py
+++ b/test/integration/smoke/test_CS-18306.py
@@ -23,8 +23,16 @@ def test_01_create_disk_offering(vm):
 assert vm is not None
 '''
 
-def test_a():
+class TestA:
+def test_a(self):
+assert True == True
+
+def test_b(self):
+assert True == True
+
+
+def test_aa():
 assert True == True
 
-def test_b():
+def test_bb():
 assert True == True
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/797fff16/tools/marvin/marvin/pytest/VM.py
--
diff --git a/tools/marvin/marvin/pytest/VM.py b/tools/marvin/marvin/pytest/VM.py
index ae80518..086d8d8 100644
--- a/tools/marvin/marvin/pytest/VM.py
+++ b/tools/marvin/marvin/pytest/VM.py
@@ -81,7 +81,7 @@ def template(test_client, zone):
 @pytest.fixture()
 def vm(test_client, account, template, tiny_service_offering, zone):
 params = {
-"displayname": "testserver",
+"displayname": "!#@#@fjdkjf",
 "username": "root",
 "password": "password",
 "ssh_port": 22,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/797fff16/tools/pytest-xdist/xdist/dsession.py
--
diff --git a/tools/pytest-xdist/xdist/dsession.py 
b/tools/pytest-xdist/xdist/dsession.py
index 8385e76..e5c6609 100644
--- a/tools/pytest-xdist/xdist/dsession.py
+++ b/tools/pytest-xdist/xdist/dsession.py
@@ -61,6 +61,7 @@ class EachScheduling:
 class LoadScheduling:
 def __init__(self, numnodes, log=None):
 self.numnodes = numnodes
+self.nodetestmap = {}
 self.node2pending = {}
 self.node2collection = {}
 self.nodes = []
@@ -98,24 +99,8 @@ class LoadScheduling:
 self.check_schedule(node, duration=duration)
 
 def check_schedule(self, node, duration=0):
-if self.pending:
-# how many nodes do we have?
-num_nodes = len(self.node2pending)
-# if our node goes below a heuristic minimum, fill it out to
-# heuristic maximum
-items_per_node_min = max(
-2, len(self.pending) // num_nodes // 4)
-items_per_node_max = max(
-2, len(self.pending) // num_nodes // 2)
-node_pending = self.node2pending[node]
-if len(node_pending) < items_per_node_min:
-if duration >= 0.1 and len(node_pending) >= 2:
-# seems the node is doing long-running tests
-# and has enough items to continue
-# so let's rather wait with sending new items
-return
-num_send = items_per_node_max - len(node_pending)
-self._send_tests(node, num_send)
+if self.pending or len(self.node2collection[node] > 0):
+self._send_tests(node)
 
 self.log("num items waiting for node:", len(self.pending))
 #self.log("node2pending:", self.node2pending)
@@ -150,22 +135,28 @@ class LoadScheduling:
 if not self.collection:
 return
 
-# how many items per node do we have about?
-items_per_node = len(self.collection) // len(self.node2pending)
-# take a fraction of tests for initial distribution
-node_chunksize = max(items_per_node // 4, 2)
-# and initialize each node with a chunk of tests
 for node in self.nodes:
-self._send_tests(node, node_chunksize)
+self._send_tests(node)
 
 #f = open("/tmp/sent", "w")
-def _send_tests(self, node, num):
-tests_per_node = self.pending[:num]
+def _send_tests(self, node):
+  

[2/3] git commit: updated refs/heads/pytest to 797fff1

[edison]

add xdist


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/145542d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/145542d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/145542d6

Branch: refs/heads/pytest
Commit: 145542d662518266c8af86e59f70fed6eafa3c18
Parents: 9610685
Author: Edison Su 
Authored: Tue Sep 16 11:45:55 2014 -0700
Committer: Edison Su 
Committed: Tue Sep 16 11:45:55 2014 -0700

--
 test/integration/smoke/test_CS-18306.py |   8 +
 .../marvin/pytest/pytest_marvin_plugin.py   |  10 +-
 tools/pytest-xdist/CHANGELOG| 134 +
 tools/pytest-xdist/ISSUES.txt   |  31 ++
 tools/pytest-xdist/LICENSE  |  19 +
 tools/pytest-xdist/MANIFEST.in  |   7 +
 tools/pytest-xdist/README.txt   | 212 
 tools/pytest-xdist/example/boxed.txt|  62 +++
 tools/pytest-xdist/setup.py |  30 ++
 tools/pytest-xdist/testing/acceptance_test.py   | 486 +++
 tools/pytest-xdist/testing/conftest.py  |  36 ++
 tools/pytest-xdist/testing/test_boxed.py|  56 +++
 tools/pytest-xdist/testing/test_dsession.py | 240 +
 tools/pytest-xdist/testing/test_looponfail.py   | 280 +++
 tools/pytest-xdist/testing/test_plugin.py   |  70 +++
 tools/pytest-xdist/testing/test_remote.py   | 248 ++
 tools/pytest-xdist/testing/test_slavemanage.py  | 241 +
 tools/pytest-xdist/tox.ini  |  32 ++
 tools/pytest-xdist/xdist/__init__.py|   2 +
 tools/pytest-xdist/xdist/dsession.py| 460 ++
 tools/pytest-xdist/xdist/looponfail.py  | 230 +
 tools/pytest-xdist/xdist/newhooks.py|  21 +
 tools/pytest-xdist/xdist/plugin.py  | 131 +
 tools/pytest-xdist/xdist/remote.py  | 147 ++
 tools/pytest-xdist/xdist/slavemanage.py | 316 
 25 files changed, 3505 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145542d6/test/integration/smoke/test_CS-18306.py
--
diff --git a/test/integration/smoke/test_CS-18306.py 
b/test/integration/smoke/test_CS-18306.py
index 416cb5e..cb555ee 100644
--- a/test/integration/smoke/test_CS-18306.py
+++ b/test/integration/smoke/test_CS-18306.py
@@ -17,6 +17,14 @@
 # under the License.
 import pytest
 
+'''
 @pytest.mark.tags(tags=["advanced"], required_hardware="false")
 def test_01_create_disk_offering(vm):
 assert vm is not None
+'''
+
+def test_a():
+assert True == True
+
+def test_b():
+assert True == True
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145542d6/tools/marvin/marvin/pytest/pytest_marvin_plugin.py
--
diff --git a/tools/marvin/marvin/pytest/pytest_marvin_plugin.py 
b/tools/marvin/marvin/pytest/pytest_marvin_plugin.py
index b5a5ae4..abe844b 100644
--- a/tools/marvin/marvin/pytest/pytest_marvin_plugin.py
+++ b/tools/marvin/marvin/pytest/pytest_marvin_plugin.py
@@ -16,7 +16,6 @@
 # under the License.
 import pytest
 import os
-import distutils
 
 from marvin.utils import initTestClass,getMarvin
 from .VM import 
(vm,tiny_service_offering,template,test_client,account,domain,zone)
@@ -25,9 +24,6 @@ def pytest_configure(config):
 config.addinivalue_line("markers",
 "tags(name): tag tests")
 
-result = getMarvin()
-if result is None:
-pytest.fail("failed to init marvin plugin")
 marvin_init_tags()
 
 g_marvin_filter = {
@@ -66,6 +62,12 @@ def pytest_runtest_setup(item):
 if found is not True:
 pytest.skip("doesn't match tags")
 
+@pytest.fixture(scope="session", autouse=True)
+def marvin_init_session():
+result = getMarvin()
+if result is None:
+pytest.fail("failed to init marvin plugin")
+
 @pytest.fixture(scope="class", autouse=True)
 def marvin_inject_testclass(request):
 if request.cls is None:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145542d6/tools/pytest-xdist/CHANGELOG
--
diff --git a/tools/pytest-xdist/CHANGELOG b/tools/pytest-xdist/CHANGELOG
new file mode 100644
index 000..4e20fce
--- /dev/null
+++ b/tools/pytest-xdist/CHANGELOG
@@ -0,0 +1,134 @@
+1.11
+-
+
+- fix pytest/xdist issue485 (also depends on py-1.4.22):
+  attach stdout/stderr on --boxed processes that die.
+
+- fix pytest/xdist issue503: make sure that a node has usually
+  two items to execute to avoid scoped fixtures to be torn down
+  pre-maturely (fixture teardown/setup is "n

[1/3] add xdist

[edison]

Repository: cloudstack
Updated Branches:
  refs/heads/pytest 9610685f4 -> 797fff165


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145542d6/tools/pytest-xdist/xdist/dsession.py
--
diff --git a/tools/pytest-xdist/xdist/dsession.py 
b/tools/pytest-xdist/xdist/dsession.py
new file mode 100644
index 000..8385e76
--- /dev/null
+++ b/tools/pytest-xdist/xdist/dsession.py
@@ -0,0 +1,460 @@
+import difflib
+
+import pytest
+import py
+from xdist.slavemanage import NodeManager
+
+
+queue = py.builtin._tryimport('queue', 'Queue')
+
+
+class EachScheduling:
+
+def __init__(self, numnodes, log=None):
+self.numnodes = numnodes
+self.node2collection = {}
+self.node2pending = {}
+if log is None:
+self.log = py.log.Producer("eachsched")
+else:
+self.log = log.eachsched
+self.collection_is_completed = False
+
+def hasnodes(self):
+return bool(self.node2pending)
+
+def addnode(self, node):
+self.node2collection[node] = None
+
+def tests_finished(self):
+if not self.collection_is_completed:
+return False
+return True
+
+def addnode_collection(self, node, collection):
+assert not self.collection_is_completed
+assert self.node2collection[node] is None
+self.node2collection[node] = list(collection)
+self.node2pending[node] = []
+if len(self.node2pending) >= self.numnodes:
+self.collection_is_completed = True
+
+def remove_item(self, node, item_index, duration=0):
+self.node2pending[node].remove(item_index)
+
+def remove_node(self, node):
+# KeyError if we didn't get an addnode() yet
+pending = self.node2pending.pop(node)
+if not pending:
+return
+crashitem = self.node2collection[node][pending.pop(0)]
+# XXX do or report something wrt the remaining per-node pending items?
+return crashitem
+
+def init_distribute(self):
+assert self.collection_is_completed
+for node, pending in self.node2pending.items():
+node.send_runtest_all()
+pending[:] = range(len(self.node2collection[node]))
+
+
+class LoadScheduling:
+def __init__(self, numnodes, log=None):
+self.numnodes = numnodes
+self.node2pending = {}
+self.node2collection = {}
+self.nodes = []
+self.pending = []
+if log is None:
+self.log = py.log.Producer("loadsched")
+else:
+self.log = log.loadsched
+self.collection_is_completed = False
+
+def hasnodes(self):
+return bool(self.node2pending)
+
+def addnode(self, node):
+self.node2pending[node] = []
+self.nodes.append(node)
+
+def tests_finished(self):
+if not self.collection_is_completed:
+return False
+for pending in self.node2pending.values():
+if len(pending) >= 2:
+return False
+return True
+
+def addnode_collection(self, node, collection):
+assert not self.collection_is_completed
+assert node in self.node2pending
+self.node2collection[node] = list(collection)
+if len(self.node2collection) >= self.numnodes:
+self.collection_is_completed = True
+
+def remove_item(self, node, item_index, duration=0):
+self.node2pending[node].remove(item_index)
+self.check_schedule(node, duration=duration)
+
+def check_schedule(self, node, duration=0):
+if self.pending:
+# how many nodes do we have?
+num_nodes = len(self.node2pending)
+# if our node goes below a heuristic minimum, fill it out to
+# heuristic maximum
+items_per_node_min = max(
+2, len(self.pending) // num_nodes // 4)
+items_per_node_max = max(
+2, len(self.pending) // num_nodes // 2)
+node_pending = self.node2pending[node]
+if len(node_pending) < items_per_node_min:
+if duration >= 0.1 and len(node_pending) >= 2:
+# seems the node is doing long-running tests
+# and has enough items to continue
+# so let's rather wait with sending new items
+return
+num_send = items_per_node_max - len(node_pending)
+self._send_tests(node, num_send)
+
+self.log("num items waiting for node:", len(self.pending))
+#self.log("node2pending:", self.node2pending)
+
+def remove_node(self, node):
+self.nodes.remove(node)
+pending = self.node2pending.pop(node)
+if not pending:
+return
+# the node has crashed on the item if there are pending ones
+# and we are told to remove the node
+crashitem = self.collection[pending.pop(0)