+1, If master builds it is alright by me. We will have to fix forward on this one.
On Sat, Jun 7, 2014 at 10:55 AM, Sebastien Goasguen <run...@gmail.com> wrote: > I applied this patch to master today, it's not a merge of the xen2server > branch per se but the work was done in that branch. > > This renames the xen plugin as xenserver. > > I know that I jumped the gun a bit on the merge window, but I am willing to > revert it if people are not OK with this. I just wanted to avoid additional > rebasing work. > > @Tim, thanks for the patch/refactoring > > -sebastien > > > On Jun 6, 2014, at 3:53 PM, sebgoa <run...@gmail.com> wrote: > >> >> On Jun 6, 2014, at 9:35 PM, Rohit Yadav <bhais...@apache.org> wrote: >> >>> >>> >>> >>> On Sat, Jun 7, 2014 at 12:51 AM, sebgoa <run...@gmail.com> wrote: >>> >>> On Jun 6, 2014, at 8:41 PM, Rohit Yadav <bhais...@apache.org> wrote: >>> >>>> Hi again, >>>> >>>> I was unable to deploy basic zone, I did: >>>> >>>> # marvin and python dependencies were pre-installed >>>> cd tools/devcloud; >>>> python ../marvin/marvin/deployDataCenter.py -i devcloud.cfg >>>> >>>> The error I got was related to agent communication, if this can help >>>> resolve the issue: >>>> Exception Occurred :['Traceback (most recent call last):\n', ' File >>>> "../marvin/marvin/deployDataCenter.py", line 136, in addHosts\n ret = >>>> self.__apiClient.addHost(hostcmd)\n', ' File >>>> "/Library/Python/2.7/site-packages/Marvin-0.1.0-py2.7.egg/marvin/cloudstackAPI/cloudstackAPIClient.py", >>>> line 1492, in addHost\n response = >>>> self.connection.marvinRequest(command, response_type=response, >>>> method=method)\n', ' File >>>> "/Library/Python/2.7/site-packages/Marvin-0.1.0-py2.7.egg/marvin/cloudstackConnection.py", >>>> line 378, in marvinRequest\n raise e\n', 'CloudstackAPIException: >>>> Execute cmd: addhost failed, due to: errorCode: 530, errorText:Cannot >>>> transit agent status with event AgentDisconnected for host 1, mangement >>>> server id is 4278190080,Unable to transition to a new state from Creating >>>> via AgentDisconnected\n'] >>>> >>> >>> DevCloud is broken with 4.4 and master... >>> >>> o.O How do people test ACS who lack dedicated infrastructure? In that case, >>> let's merge the patch? >>> >> >> I will wait till tomorrow morning, and merge then if no-one complained. This >> will be a fast merge, but if people are not happy later on, I will revert. >> >> Tim went the extra mile to get this done, so I don't want to miss the window. >> >> -sebastien >> >>> Regards. >>> >>> >>>> But, in the management server log I see that it identified the product >>>> version: >>>> "Found host devcloud ip=192.168.56.10 product version=1.6.0" >>>> >>>> In this case I'm suspecting my local env issue, the logs suggested it was >>>> unable to create the directory "/opt/cloud/bin" and some agent exceptions. >>>> >>>> Tim, I think it works but failed on my env due to some env specific issue; >>>> what modification etc. do we have to do to make it work against DevCloud, >>>> or install libs/dependencies inside it? >>>> >>>> The patch is clean, builds and ACS runs and upon adding host it identified >>>> and triggered the XenServer plugin so I think we can allow it to merge on >>>> master (but we need to fix it to make it work with Xen.org xen server used >>>> inside DevCloud using deployDataCenter script). >>>> >>>> If no one objects, may I merge it on master? >>>> >>>> Regards. >>>> >>>> >>>> >>>> >>>> On Fri, Jun 6, 2014 at 11:46 PM, Rohit Yadav <bhais...@apache.org> wrote: >>>> On Fri, Jun 6, 2014 at 10:14 PM, sebgoa <run...@gmail.com> wrote: >>>> Folks, >>>> >>>> Tim has prepared a pretty significant patch in the review it lists below. >>>> There is also a wiki page describing the change. >>>> >>>> Basically it splits XenServer and XenProject (pure Xen) in two separate >>>> hypervisors. Until now we had used XenServer to also handle XenProject. >>>> It will allow to split the way we connect to the two hypervisors. >>>> >>>> Now Tim's patch is actually a patch to *master* and not the xen2server >>>> branch. >>>> >>>> Since it's a ton of work to rebase such a big refactoring, I am wondering >>>> if we could not allow this patch to be applied in master directly. >>>> And apply quickly…we are 24 hours now since Tim sent his email, another 48 >>>> would make it 72. >>>> >>>> Thoughts ? >>>> >>>> >>>> +1 I just reviewed the patch, I was able to apply it cleanly on latest >>>> master and successfully do a clean build. I next tested it with DevCloud >>>> and currently in middle of deploying a basic zone. If if this fails, I >>>> guess it looks good to me for merging, if there are some issues we can >>>> always revisit. >>>> >>>> Command log: >>>> wget https://reviews.apache.org/r/22270/diff/raw/ -O xen-tim.patch # the >>>> patch was about 1.8M in size >>>> cd cloudstack >>>> git pull --rebase origin master >>>> git am --ignore-whitespace ../xen-tim.patch >>>> mvn clean install -P systemvm,developer # build was successfully, the >>>> plugin is now Hypervisor XenServer >>>> mvn -P developer -pl developer -Ddeploydb # clean db deployed successfully >>>> mvn -pl :cloud-client-ui jetty:run # UI was up, I'm now in middle of >>>> deploying basic zone >>>> >>>> Regards. >>>> >>>> >>>> >>>> >>>> >>>> -sebastien >>>> >>>> On Jun 5, 2014, at 8:02 PM, Tim Mackey <tmac...@gmail.com> wrote: >>>> >>>>> I've just submitted a review request which is essentially a merge of >>>>> the xen2server feature branch back into master. Since this is a >>>>> refactoring of the Xen plugin to make it more explicitly a XenServer >>>>> plugin per the feature: >>>>> https://cwiki.apache.org/confluence/display/CLOUDSTACK/Convert+Xen+usage+to+XenServer, >>>>> I wanted to ensure everyone was aware of what is changing. Diff >>>>> details can be found here: https://reviews.apache.org/r/22270/ >>>>> >>>>> The key item in this change is that what was the xen plugin has now >>>>> moved to become the xenserver plugin to make way for a pure xen >>>>> plugin. If you are working on something which is XenServer specific, >>>>> you'll probably want to take a look at what I've done, sanity check it >>>>> against your plans and ask questions. Additionally, if you've done >>>>> some work in XenServer code since the start of April, you might want >>>>> to make certain I didn't accidentally revert any of your changes >>>>> during conflict resolution. I tried to be careful, but accidents do >>>>> happen. >>>>> >>>>> The merge point was commit 603eab7 (HEAD yesterday), and from there I >>>>> did a bunch of sanity testing using XenServer 6.2. I also tested and >>>>> validated with the current HEAD (8b5ec64). If you were looking at or >>>>> testing anything on the xen2server branch, no new functionality was >>>>> introduced from that branch; this is effectively a merge with >>>>> conflicts resolved. >>>>> >>>>> Thanks >>>>> >>>>> -tim >>>> >>>> >>>> >>> >>> >> > -- Daan
