You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/20 10:58:36 UTC
[1/3] git commit: updated refs/heads/4.9 to e860249
Repository: cloudstack
Updated Branches:
refs/heads/4.9 6dced70aa -> e860249e4
CLOUDSTACK-9691: Fixed unhandeled excetion in list snapshot command when
a primary store is deleted related to it
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fd28f2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fd28f2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fd28f2b
Branch: refs/heads/4.9
Commit: 2fd28f2bfff243ed026b377a7fd5b43b76bd3b94
Parents: 6dced70
Author: Anshul Gangwar <an...@accelerite.com>
Authored: Tue Aug 30 12:01:20 2016 +0530
Committer: Anshul Gangwar <an...@accelerite.com>
Committed: Mon Feb 20 11:30:02 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fd28f2b/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 6a7f0ab..eaf48c7 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -527,6 +527,9 @@ public class ApiResponseHelper implements ResponseGenerator {
long storagePoolId = snapshotStore.getDataStoreId();
DataStore dataStore = dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary);
+ if (dataStore == null) {
+ return DataStoreRole.Image;
+ }
Map<String, String> mapCapabilities = dataStore.getDriver().getCapabilities();
[3/3] git commit: updated refs/heads/4.9 to e860249
Posted by ra...@apache.org.
Merge pull request #1847 from anshul1886/CLOUDSTACK-9691
CLOUDSTACK-9691: Fixed unhandeled excetion in list snapshot command when a primary store is deleted related to it@mike-tutkowski After support for snapshots on solidifire there are many places which are prone to these NullPointer exceptions resulting in various issues. Root cause for these issues is that we get the primary storage associated with snapshot and then figure out how to handle but if that store is deleted then it results in NullPointer exceptions. Without solidfire we don't need to access primary storage.
Should we handle that as issues are found or could there be other way to fix all of these issues?
* pr/1847:
CLOUDSTACK-9691: Added test list_snapshots_with_removed_data_store
CLOUDSTACK-9691: Fixed unhandeled excetion in list snapshot command when a primary store is deleted related to it
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e860249e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e860249e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e860249e
Branch: refs/heads/4.9
Commit: e860249e4f0cfc8b93b46f870efa2eeace8bb703
Parents: 6dced70 3caedb9
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Mon Feb 20 16:25:15 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Mon Feb 20 16:25:15 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 3 +
test/integration/smoke/test_snapshots.py | 139 ++++++++++++++++++-
2 files changed, 139 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/4.9 to e860249
Posted by ra...@apache.org.
CLOUDSTACK-9691: Added test list_snapshots_with_removed_data_store
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3caedb9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3caedb9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3caedb9e
Branch: refs/heads/4.9
Commit: 3caedb9ef3556e2c59681f4ec52662f8d7797888
Parents: 2fd28f2
Author: Nicolas Vazquez <ni...@gmail.com>
Authored: Fri Feb 17 11:54:03 2017 +0530
Committer: Anshul Gangwar <an...@accelerite.com>
Committed: Mon Feb 20 11:30:30 2017 +0530
----------------------------------------------------------------------
test/integration/smoke/test_snapshots.py | 139 +++++++++++++++++++++++++-
1 file changed, 136 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3caedb9e/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index 638b66c..a6230bc 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -24,12 +24,17 @@ from marvin.lib.base import (VirtualMachine,
Account,
Template,
ServiceOffering,
- Snapshot)
+ Snapshot,
+ StoragePool,
+ Volume)
from marvin.lib.common import (get_domain,
get_template,
get_zone,
+ get_pod,
list_volumes,
- list_snapshots)
+ list_snapshots,
+ list_storage_pools,
+ list_clusters)
from marvin.lib.decoratorGenerators import skipTestIf
@@ -95,6 +100,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.pod = get_pod(cls.apiclient, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.hypervisorNotSupported = False
@@ -140,7 +146,6 @@ class TestSnapshotRootDisk(cloudstackTestCase):
mode=cls.services["mode"]
)
- cls._cleanup.append(cls.virtual_machine)
cls._cleanup.append(cls.service_offering)
cls._cleanup.append(cls.account)
cls._cleanup.append(cls.template)
@@ -255,3 +260,131 @@ class TestSnapshotRootDisk(cloudstackTestCase):
self.assertTrue(is_snapshot_on_nfs(
self.apiclient, self.dbclient, self.config, self.zone.id, snapshot.id))
return
+
+ @skipTestIf("hypervisorNotSupported")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ def test_02_list_snapshots_with_removed_data_store(self):
+ """Test listing volume snapshots with removed data stores
+ """
+
+ # 1) Create new Primary Storage
+ clusters = list_clusters(
+ self.apiclient,
+ zoneid=self.zone.id
+ )
+ assert isinstance(clusters,list) and len(clusters)>0
+
+ storage = StoragePool.create(self.apiclient,
+ self.services["nfs"],
+ clusterid=clusters[0].id,
+ zoneid=self.zone.id,
+ podid=self.pod.id
+ )
+ self.assertEqual(
+ storage.state,
+ 'Up',
+ "Check primary storage state"
+ )
+ self.assertEqual(
+ storage.type,
+ 'NetworkFilesystem',
+ "Check storage pool type"
+ )
+ storage_pools_response = list_storage_pools(self.apiclient,
+ id=storage.id)
+ self.assertEqual(
+ isinstance(storage_pools_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ self.assertNotEqual(
+ len(storage_pools_response),
+ 0,
+ "Check list Hosts response"
+ )
+ storage_response = storage_pools_response[0]
+ self.assertEqual(
+ storage_response.id,
+ storage.id,
+ "Check storage pool ID"
+ )
+ self.assertEqual(
+ storage.type,
+ storage_response.type,
+ "Check storage pool type "
+ )
+
+ # 2) Migrate VM ROOT volume to new Primary Storage
+ volumes = list_volumes(
+ self.apiclient,
+ virtualmachineid=self.virtual_machine_with_disk.id,
+ type='ROOT',
+ listall=True
+ )
+ Volume.migrate(self.apiclient,
+ storageid=storage.id,
+ volumeid=volumes[0].id,
+ livemigrate="true"
+ )
+
+ volume_response = list_volumes(
+ self.apiclient,
+ id=volumes[0].id,
+ )
+ self.assertNotEqual(
+ len(volume_response),
+ 0,
+ "Check list Volumes response"
+ )
+ volume_migrated = volume_response[0]
+ self.assertEqual(
+ volume_migrated.storageid,
+ storage.id,
+ "Check volume storage id"
+ )
+ self.cleanup.append(self.virtual_machine_with_disk)
+ self.cleanup.append(storage)
+
+ # 3) Take snapshot of VM ROOT volume
+ snapshot = Snapshot.create(
+ self.apiclient,
+ volume_migrated.id,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Snapshot created: ID - %s" % snapshot.id)
+
+ # 4) Delete VM and created Primery Storage
+ cleanup_resources(self.apiclient, self.cleanup)
+
+ # 5) List snapshot and verify it gets properly listed although Primary Storage was removed
+ snapshot_response = Snapshot.list(
+ self.apiclient,
+ id=snapshot.id
+ )
+ self.assertNotEqual(
+ len(snapshot_response),
+ 0,
+ "Check list Snapshot response"
+ )
+ self.assertEqual(
+ snapshot_response[0].id,
+ snapshot.id,
+ "Check snapshot id"
+ )
+
+ # 6) Delete snapshot and verify it gets properly deleted (should not be listed)
+ self.cleanup = [snapshot]
+ cleanup_resources(self.apiclient, self.cleanup)
+
+ snapshot_response_2 = Snapshot.list(
+ self.apiclient,
+ id=snapshot.id
+ )
+ self.assertEqual(
+ snapshot_response_2,
+ None,
+ "Check list Snapshot response"
+ )
+
+ return
\ No newline at end of file