Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13B2FE350 for ; Sat, 26 Jan 2013 05:15:32 +0000 (UTC) Received: (qmail 45261 invoked by uid 500); 26 Jan 2013 05:15:31 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 45130 invoked by uid 500); 26 Jan 2013 05:15:31 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 45110 invoked by uid 99); 26 Jan 2013 05:15:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 05:15:30 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of shadowsor@gmail.com designates 209.85.128.176 as permitted sender) Received: from [209.85.128.176] (HELO mail-ve0-f176.google.com) (209.85.128.176) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 05:15:25 +0000 Received: by mail-ve0-f176.google.com with SMTP id jz10so536789veb.21 for ; Fri, 25 Jan 2013 21:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=ce8VyQFSUT3A3AnY8DIZCvey/ZSoatCqorQ10HIyf7U=; b=n7mY89LubD/eLoYDJL4pZuN1pitXf+l2AKIht4veTGwi2mTWVDG0JI1Zq9ufi6NMOP Ct+FxAVahHltbmIHx9ujBCB7pFPK7EdEWMC9pfR8xCLabPzxgp86rErN35LpZwpenpoP XGMDfXCF9o/8LE/g7eL2osOzU/it774Xk51PXJ0ZKP5asZcnEsocNSDOc15Eb9av3f9q juRVEIBgramhyfSR6O7labcYmPQpTTERKpeaoh/15kHGiYcc6Rj+7StCcvNurw4GhM1s 25NNciZ5TyfQbwRahm/V2jNykTturJAfwXBrzZ6hIV8Y6vwS7uoEcfLngcJYk0R9hsuT GBPg== MIME-Version: 1.0 X-Received: by 10.52.174.109 with SMTP id br13mr7406491vdc.23.1359177305084; Fri, 25 Jan 2013 21:15:05 -0800 (PST) Received: by 10.58.152.143 with HTTP; Fri, 25 Jan 2013 21:15:04 -0800 (PST) In-Reply-To: References: Date: Fri, 25 Jan 2013 22:15:04 -0700 Message-ID: Subject: Re: [MERGE][ACS41] javelin to master From: Marcus Sorensen To: cloudstack-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=bcaec51b15e574d50a04d42a20d2 X-Virus-Checked: Checked by ClamAV on apache.org --bcaec51b15e574d50a04d42a20d2 Content-Type: text/plain; charset=ISO-8859-1 On Fri, Jan 25, 2013 at 9:43 PM, Alex Huang wrote: > > > > We are requesting merge from javelin to master. We have merged all > > changes from master as of 1/24/2013. Will do another merge to make sure > > javelin is updated once it's passed the 72 hours. > > > > The content of the merge is the storage framework refactoring and > > converting everything use Spring. The storage refactoring is put in as > an > > independent piece that is not hooked into CloudStack yet. Edison is > working > > on the hookins in another branch. We like to get this into 4.1 because > several > > of the components added to Cloudstack will require the Spring framework > or > > they have to be redone. > For mt own clarification, the storage refactoring code is in javelin, but cloudstack is currently not using it, correct? At this point I was thinking to myself that the storage refactor was not going to make 4.1, due to some of the discussions and updates. Or if it did that we wouldn't have time to work on making anything utilize it. So at least for the storage part, it sounds like the storage refactor code will be there, but it's still a question on whether it will be hooked in for 4.1 (I assume). By voting to merge this are we committing to having to potentially push back code freeze if the things you mention don't get fixed in time, or if this means that we have to wait for the storage hook-up branch? Are you saying there is stuff already in master that will be broken without Spring, or that other feature branches (besides the storage refactor) rely on it? > > > > Javelin has been checked with marvin integration testing to make sure the > > server behaves the same. skipTests has been turned off and the unit > tests > > are running clean. Non-oss is also converted over but there might be a > small > > issue with VmWare. Usage and awsapi also have small issues but we > believe > > we can fix those within the 72 hour waiting period. Is the integration coverage good enough now that we trust it for a change this large? Not to be pessimistic, and perhaps this has nothing to do with the merge request itself, but two weeks ago when we were trying to add a test to the test_volumes.py we found that it was only partially working to begin with. Ryan fixed that one up. So I'm wondering if the integration testing worked because the tests have been fixed up, or if you just mean that the results are the same (tests that failed before still fail, successes still succeed). > > > --Alex > > --bcaec51b15e574d50a04d42a20d2--