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 > >
