RE: CLVM broken on master

2013-10-17 Thread Edison Su
Marcus, would you mind to check in your fix into master? Thanks. > -Original Message- > From: SuichII, Christopher [mailto:chris.su...@netapp.com] > Sent: Thursday, October 17, 2013 4:35 PM > To: > Subject: Re: CLVM broken on master > > I've done some test

Re: CLVM broken on master

2013-10-17 Thread SuichII, Christopher
gt;>> For CLVM, the copy template from secondary to primary and create volume >>>> from template logic is handled by >>>> CloudStackPrimaryDataStoreDriverImpl->copyAsync, not in >>>> AncientDataMotionStrategy >>>> You can check the co

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
led by >>> CloudStackPrimaryDataStoreDriverImpl->copyAsync, not in >>> AncientDataMotionStrategy >>> You can check the code: 4fb459355337c874a10f47c0224af72d6fef1ff2. >>> >>>> -----Original Message- >>>> From: Marcus Sorensen [mailto:shadow...@gm

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
cientDataMotionStrategy >> You can check the code: 4fb459355337c874a10f47c0224af72d6fef1ff2. >> >>> -Original Message- >>> From: Marcus Sorensen [mailto:shadow...@gmail.com] >>> Sent: Thursday, October 17, 2013 2:07 PM >>> To: dev@clouds

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
Thursday, October 17, 2013 2:07 PM >> To: dev@cloudstack.apache.org >> Subject: Re: CLVM broken on master >> >> I think if we can change this line: >> >> if ((srcData.getObjectType() == DataObjectType.TEMPLATE) && >> (destData.getObjectType() == DataObjectType.

RE: CLVM broken on master

2013-10-17 Thread Edison Su
> From: Marcus Sorensen [mailto:shadow...@gmail.com] > Sent: Thursday, October 17, 2013 2:07 PM > To: dev@cloudstack.apache.org > Subject: Re: CLVM broken on master > > I think if we can change this line: > > if ((srcData.getObjectType() == DataObjectType.TEMPLATE

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
I think if we can change this line: if ((srcData.getObjectType() == DataObjectType.TEMPLATE) && (destData.getObjectType() == DataObjectType.TEMPLATE && destData.getDataStore().getRole() == DataStoreRole.Primary)) { to something like: if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcD

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
I ran that through my tester, it didn't like it. That actually kept the system vms from starting. Since CopyCommand is used for both template to template and template to primary, it seems that the original template copy is fine but now this catches the case where the source template is on primary

Re: CLVM broken on master

2013-10-17 Thread SuichII, Christopher
Hm, interesting. Since nothing else in the if/else if series there depends on the src being a template, I'd imagine it would be safe to just have the check be: } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && destDataStore.getRole() == DataStoreRole.Primary) { In hindsight, add

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
Actually, I don't think that will fix this (though it probably fixes something :-) The issue I'm having is that we went from 'if source is a template on nfs and destination is primary storage' to 'if source is a template and destination is a template on primary storage'. We aren't copying 'templat

Re: CLVM broken on master

2013-10-17 Thread Marcus Sorensen
Ok, let me test it. On Thu, Oct 17, 2013 at 12:56 PM, SuichII, Christopher wrote: > Oh, I noticed this and created a fix, which I thought I already had submitted > since it was a part of the storage refactoring a couple weeks back. I'll post > the patch for review now. > > -- > Chris Suich > ch

Re: CLVM broken on master

2013-10-17 Thread SuichII, Christopher
Oh, I noticed this and created a fix, which I thought I already had submitted since it was a part of the storage refactoring a couple weeks back. I'll post the patch for review now. -- Chris Suich chris.su...@netapp.com NetApp Software Engineer Data Center Platforms – Cloud Solutions Citrix, Ci