[GitHub] borisstoyanov commented on issue #2376: [4.11] Smoketest Health Check
borisstoyanov commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-371056368 @blueorangutan test centos7 xenserver-71 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-371056494 @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2474: CLOUDSTACK-10246 Fix Host HA and VM HA issues
DaanHoogland commented on issue #2474: CLOUDSTACK-10246 Fix Host HA and VM HA issues URL: https://github.com/apache/cloudstack/pull/2474#issuecomment-371067952 @Slair1 are you going to modularise the handleDisconnectWithInvestigation method? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
DaanHoogland commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage URL: https://github.com/apache/cloudstack/pull/2425#issuecomment-371068913 @rafaelweingartner , yes you can. It seems to be a timing issue. the host does not have a state needed in some occurences and does have that state in other runs. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
DaanHoogland commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371069607 yes @khos2ow , please replace either one or the other or vice versa. don't forget the test class as well, if you will. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks.
borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371076646 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks.
blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371076827 @borisstoyanov a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
borisstoyanov commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371077099 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
blueorangutan commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371077396 @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks.
borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371076646 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
blueorangutan commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371086993 Packaging result: ?centos6 ?centos7 ?debian. JID-1763 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
rafaelweingartner commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage URL: https://github.com/apache/cloudstack/pull/2425#issuecomment-371089577 Thanks @DaanHoogland! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ernjvr commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition
ernjvr commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition URL: https://github.com/apache/cloudstack/pull/2449#issuecomment-371106986 Hi Rafael, guys. Any resolution regarding this PR? Perhaps this PR as an interim solution until someone has an opportunity to do a more comprehensive solution? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API.
rafaelweingartner commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API. URL: https://github.com/apache/cloudstack/pull/2387#issuecomment-371117317 @borisroman are those errors/failures ok? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API.
borisstoyanov commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API. URL: https://github.com/apache/cloudstack/pull/2387#issuecomment-371118121 Let me run smoke tests again, but I think we've seen them quite frequently on random PRs. @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API.
blueorangutan commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API. URL: https://github.com/apache/cloudstack/pull/2387#issuecomment-371118309 @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API.
rafaelweingartner commented on issue #2387: CLOUDSTACK-8855 Improve Error Message for Host Alert State and reconnect host API. URL: https://github.com/apache/cloudstack/pull/2387#issuecomment-371118779 ok, thanks. @DaanHoogland have you approaved this PR? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition
DaanHoogland commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition URL: https://github.com/apache/cloudstack/pull/2449#issuecomment-371131289 @ernjvr I think you want to address @rafaelweingartner instead of Rafael. Better change on reaction. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition
rafaelweingartner commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition URL: https://github.com/apache/cloudstack/pull/2449#issuecomment-371132517 @ernjvr I would go with this one. It does not mean that I like this type of solution. It is a palliative one, and we already have so much of these things around. However, I do understand that to change the database upgrade scheme that we use now is something way more complex (at least to do something good). I would expect us to change the DB schema upgrade method in a future ACS 5 for instance. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ustcweizhou commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition
ustcweizhou commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition URL: https://github.com/apache/cloudstack/pull/2449#issuecomment-371149120 @ernjvr have you tested it ? If you import this sql file into mysql or mariadb, it might work. However, In my experience, java does not accept procedure in sql. It uses CallableStatement https://docs.oracle.com/javase/7/docs/api/java/sql/Connection.html#prepareCall(java.lang.String) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ustcweizhou opened a new pull request #2479: CLOUDSTACK-10278: Introduce Flyway migration on CloudStack database
ustcweizhou opened a new pull request #2479: CLOUDSTACK-10278: Introduce Flyway migration on CloudStack database URL: https://github.com/apache/cloudstack/pull/2479 @rhtyd @DaanHoogland @rafaelweingartner @blueorangutan This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2479: CLOUDSTACK-10278: Introduce Flyway migration on CloudStack database
rhtyd commented on a change in pull request #2479: CLOUDSTACK-10278: Introduce
Flyway migration on CloudStack database
URL: https://github.com/apache/cloudstack/pull/2479#discussion_r172878095
##
File path: engine/schema/pom.xml
##
@@ -48,5 +48,10 @@
cloud-framework-db
${project.version}
+
+ org.flywaydb
+ flyway-core
+ 5.0.7
Review comment:
@ustcweizhou can you move the version to root level pom.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2479: CLOUDSTACK-10278: Introduce Flyway migration on CloudStack database
rhtyd commented on a change in pull request #2479: CLOUDSTACK-10278: Introduce
Flyway migration on CloudStack database
URL: https://github.com/apache/cloudstack/pull/2479#discussion_r172878721
##
File path:
engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
##
@@ -631,6 +635,27 @@ public void check() {
} finally {
lock.releaseRef();
}
+
+s_logger.info("Running Flyway migration on Cloudstack database");
+Properties dbProps = DbProperties.getDbProperties();
+final String cloudUsername = dbProps.getProperty("db.cloud.username");
+final String cloudPassword = dbProps.getProperty("db.cloud.password");
+final String cloudHost = dbProps.getProperty("db.cloud.host");
+final int cloudPort =
Integer.parseInt(dbProps.getProperty("db.cloud.port"));
+final String dbUrl = "jdbc:mysql://" + cloudHost + ":" + cloudPort +
"/cloud";
Review comment:
@ustcweizhou we also have cloud_usage database, how do we handle changes for
that?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] rafaelweingartner commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
rafaelweingartner commented on issue #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage URL: https://github.com/apache/cloudstack/pull/2425#issuecomment-371244156 If we have no objections I will be merging this one latter today. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-371247759 Trillian test result (tid-2329) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7 Total time taken: 37940 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2329-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_vm_iso.py Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Smoke tests completed. 63 look OK, 4 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_scale_vm | `Error` | 16.54 | test_scale_vm.py test_04_extract_template | `Failure` | 128.38 | test_templates.py ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py test_06_download_detached_volume | `Failure` | 149.17 | test_volumes.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2470: [CLOUDSTACK-10197] Update DisplayText of XenServer tools ISO entry in the database when it already exists
rafaelweingartner commented on issue #2470: [CLOUDSTACK-10197] Update DisplayText of XenServer tools ISO entry in the database when it already exists URL: https://github.com/apache/cloudstack/pull/2470#issuecomment-371271287 @DaanHoogland this one seems to be ready. Would you like to wait for a third and fourth eyes here? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] khos2ow commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
khos2ow commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371276965 @DaanHoogland @rafaelweingartner can you take a look at the cleanup commit? I think I leave it as this and don't squash them, what do you say? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script
rafaelweingartner commented on issue #2433: CLOUDSTACK-10268: Fix and enhance package script URL: https://github.com/apache/cloudstack/pull/2433#issuecomment-371280867 Everything seems to be ok. I would leave the commits separated to facilitate reviews. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks.
blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371281372 Trillian test result (tid-2335) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 26447 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2477-t2335-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_hostha_enable_ha_when_host_in_maintenance | `Error` | 3.73 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[cloudstack] branch master updated: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage (#2425)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new f2efbce [CLOUDSTACK-10240] ACS cannot migrate a local volume to
shared storage (#2425)
f2efbce is described below
commit f2efbcececb3cfb06a51e5d3a2e77417c19c667f
Author: Rafael Weingärtner
AuthorDate: Wed Mar 7 18:23:15 2018 -0300
[CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
(#2425)
* [CLOUDSTACK-10240] ACS cannot migrate a volume from local to shared
storage.
CloudStack is logically restricting the migration of local storages to
shared storage and vice versa. This restriction is a logical one and can be
removed for XenServer deployments. Therefore, we will enable migration of
volumes between local-shared storages in XenServers independently of their
service offering. This will work as an override mechanism to the disk offering
used by volumes. If administrators want to migrate local volumes to a shared
storage, they should be able to do so [...]
* Cleanups implemented while working on [CLOUDSTACK-10240]
* Fix test case test_03_migrate_options_storage_tags
The changes applied were:
- When loading hypervisors capabilities we must use "default" instead of
nulls
- "Enable" storage migration for simulator hypervisor
- Remove restriction on "ClusterScopeStoragePoolAllocator" to find shared
pools
---
.travis.yml| 7 +-
.../storage/FindStoragePoolsForMigrationCmd.java | 30 +-
.../FindStoragePoolsForMigrationCmdTest.java | 63 +++
.../com/cloud/vm/VirtualMachineManagerImpl.java| 266 +---
.../cloud/vm/VirtualMachineManagerImplTest.java| 472 ++---
.../dao/HypervisorCapabilitiesDaoImpl.java | 11 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 22 +-
.../ClusterScopeStoragePoolAllocator.java | 5 -
.../com/cloud/server/ManagementServerImpl.java | 133 +++---
.../com/cloud/storage/VolumeApiServiceImpl.java| 354 +++-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 25 +-
.../cloud/storage/VolumeApiServiceImplTest.java| 265 ++--
setup/db/hypervisor_capabilities.simulator.sql | 2 +-
test/integration/smoke/test_primary_storage.py | 30 +-
14 files changed, 671 insertions(+), 1014 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d5fd173..be0bfb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,9 +70,10 @@ env:
smoke/test_password_server
smoke/test_portable_publicip
smoke/test_portforwardingrules"
-
-- TESTS="smoke/test_primary_storage
- smoke/test_privategw_acl
+
+- TESTS="smoke/test_primary_storage"
+
+- TESTS="smoke/test_privategw_acl
smoke/test_projects
smoke/test_public_ip_range
smoke/test_pvlan
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 47fa965..73c596c 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -17,10 +17,10 @@
package org.apache.cloudstack.api.command.admin.storage;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,12 +29,14 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
@APICommand(name = "findStoragePoolsForMigration", description = "Lists
storage pools available for migration of a volume.", responseObject =
StoragePoolResponse.class,
-requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger =
Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName());
@@ -81,7 +83,7 @@ public class FindStoragePoolsForMigrationCmd extends
BaseListCmd {
StoragePoolResponse poolResponse =
_responseGenerator.createStoragePoolForM
[GitHub] rafaelweingartner closed pull request #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
rafaelweingartner closed pull request #2425: [CLOUDSTACK-10240] ACS cannot
migrate a local volume to shared storage
URL: https://github.com/apache/cloudstack/pull/2425
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index d5fd173d71e..be0bfb12210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,9 +70,10 @@ env:
smoke/test_password_server
smoke/test_portable_publicip
smoke/test_portforwardingrules"
-
-- TESTS="smoke/test_primary_storage
- smoke/test_privategw_acl
+
+- TESTS="smoke/test_primary_storage"
+
+- TESTS="smoke/test_privategw_acl
smoke/test_projects
smoke/test_public_ip_range
smoke/test_pvlan
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 47fa965e7dd..73c596c9e56 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -17,10 +17,10 @@
package org.apache.cloudstack.api.command.admin.storage;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,12 +29,14 @@
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
@APICommand(name = "findStoragePoolsForMigration", description = "Lists
storage pools available for migration of a volume.", responseObject =
StoragePoolResponse.class,
-requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger =
Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName());
@@ -81,7 +83,7 @@ public void execute() {
StoragePoolResponse poolResponse =
_responseGenerator.createStoragePoolForMigrationResponse(pool);
Boolean suitableForMigration = false;
for (StoragePool suitablePool : suitablePoolList) {
-if (suitablePool.getId() == pool.getId()) {
+if (StringUtils.equals(suitablePool.getUuid(),
pool.getUuid())) {
suitableForMigration = true;
break;
}
@@ -90,9 +92,27 @@ public void execute() {
poolResponse.setObjectName("storagepool");
poolResponses.add(poolResponse);
}
-
+sortPoolsBySuitabilityAndName(poolResponses);
response.setResponses(poolResponses);
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
+
+protected void sortPoolsBySuitabilityAndName(List
poolResponses) {
+Collections.sort(poolResponses, new Comparator() {
+@Override
+public int compare(StoragePoolResponse o1, StoragePoolResponse o2)
{
+if (o1.getSuitableForMigration() &&
o2.getSuitableForMigration()) {
+return o1.getName().compareTo(o2.getName());
+}
+if (o1.getSuitableForMigration()) {
+return -1;
+}
+if (o2.getSuitableForMigration()) {
+return 1;
+}
+return 0;
+}
+});
+}
}
diff --git
a/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java
b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java
new file mode 100644
index 000..2297946bec7
--- /dev/null
+++
b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java
@@ -0,0 +1,63 @@
+// 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
+//
[GitHub] rafaelweingartner commented on issue #2476: CLOUDSTACK-10317: Fix SNAT rules for additional public nics
rafaelweingartner commented on issue #2476: CLOUDSTACK-10317: Fix SNAT rules for additional public nics URL: https://github.com/apache/cloudstack/pull/2476#issuecomment-371314177 It seems that everything is ok here, can we proceed with the merge? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2471: CLOUDSTACK-10311 Agent Log Rotate variable replace bug
rafaelweingartner commented on issue #2471: CLOUDSTACK-10311 Agent Log Rotate variable replace bug URL: https://github.com/apache/cloudstack/pull/2471#issuecomment-371314345 @Slair1 can you take a look into travis failures? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer
rafaelweingartner commented on issue #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer URL: https://github.com/apache/cloudstack/pull/2465#issuecomment-371314898 @pdion891 do you have a feedback regarding the result of tests conducted by you guys? I have used this in a test environment to check the backwards compatibility with system VMs PV, and everything is ok with this use case. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks.
blueorangutan commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371320260 Trillian test result (tid-2334) Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7 Total time taken: 34262 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2477-t2334-vmware-65.zip Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Smoke tests completed. 67 look OK, 0 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ernjvr commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition
ernjvr commented on issue #2449: WIP CLOUDSTACK-10278 idempotent column addition URL: https://github.com/apache/cloudstack/pull/2449#issuecomment-371399237 Thanks for the tip @DaanHoogland. Understood @rafaelweingartner. Yes @ustcweizhou, I tested with both mysql and java. In my java test class, I invoked the com/cloud/utils/db/ScriptRunner.java to execute the engine/schema/resources/META-INF/db/schema-41000to41100.sql script, since this same class is invoked during the upgrade to execute these schema-xxx.sql scripts. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks.
borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371407405 [system-vm.log](https://github.com/apache/cloudstack/files/1792215/system-vm.log) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks.
borisstoyanov commented on issue #2477: Smaller systemvm images using sparse disks. URL: https://github.com/apache/cloudstack/pull/2477#issuecomment-371407405 [system-vm.log](https://github.com/apache/cloudstack/files/1792215/system-vm.log) Trillian id: pr2477-t2339-xenserver-71 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
