Return-Path: 
 <dev-return-73263-apmail-ambari-dev-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-dev-archive@www.apache.org
Delivered-To: apmail-ambari-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 27D2A182F7
	for <apmail-ambari-dev-archive@www.apache.org>;
 Tue, 26 May 2015 16:59:26 +0000 (UTC)
Received: (qmail 24095 invoked by uid 500); 26 May 2015 16:59:26 -0000
Delivered-To: apmail-ambari-dev-archive@ambari.apache.org
Received: (qmail 24066 invoked by uid 500); 26 May 2015 16:59:26 -0000
Mailing-List: contact dev-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@ambari.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@ambari.apache.org>
List-Post: <mailto:dev@ambari.apache.org>
List-Id: <dev.ambari.apache.org>
Reply-To: dev@ambari.apache.org
Delivered-To: mailing list dev@ambari.apache.org
Received: (qmail 24049 invoked by uid 99); 26 May 2015 16:59:25 -0000
Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 May 2015 16:59:25 +0000
Received: from reviews.apache.org (localhost [127.0.0.1])
	by reviews.apache.org (Postfix) with ESMTP id DBBFE1DBE3A;
	Tue, 26 May 2015 16:59:24 +0000 (UTC)
Content-Type: multipart/alternative;
 boundary="===============5385933321845423865=="
MIME-Version: 1.0
Subject: Re: Review Request 34269: ambari_server/utils.py should be able to
 parse version with postfix text
From: "Di Li" <dili@ca.ibm.com>
To: "Alejandro Fernandez" <afernandez@hortonworks.com>
Cc: "Di Li" <dili@ca.ibm.com>, "Ambari" <dev@ambari.apache.org>
Date: Tue, 26 May 2015 16:59:24 -0000
Message-ID: <20150526165924.18663.61424@reviews.apache.org>
X-ReviewBoard-URL: https://reviews.apache.org/
Auto-Submitted: auto-generated
Sender: "Di Li" <noreply@reviews.apache.org>
X-ReviewGroup: Ambari
X-ReviewRequest-URL: https://reviews.apache.org/r/34269/
X-Sender: "Di Li" <noreply@reviews.apache.org>
References: <20150522184216.31858.22381@reviews.apache.org>
In-Reply-To: <20150522184216.31858.22381@reviews.apache.org>
Reply-To: "Di Li" <dili@ca.ibm.com>
X-ReviewRequest-Repository: ambari

--===============5385933321845423865==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit



> On May 22, 2015, 6:42 p.m., Alejandro Fernandez wrote:
> > Ship It!

Hello Alejandro,

Could you please help commit the change to trunk? I don't have the permission to do so.


- Di


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/34269/#review84958
-----------------------------------------------------------


On May 22, 2015, 6:28 p.m., Di Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/34269/
> -----------------------------------------------------------
> 
> (Updated May 22, 2015, 6:28 p.m.)
> 
> 
> Review request for Ambari and Alejandro Fernandez.
> 
> 
> Bugs: AMBARI-10968
>     https://issues.apache.org/jira/browse/AMBARI-10968
> 
> 
> Repository: ambari
> 
> 
> Description
> -------
> 
> Apache ambari 2.0 has version "2.0.0" in the version file "/var/lib/ambari-server/resources/version".
> 
> Since ambari is open source, it can be built with version information that has digits plus postfix like "2.0.0._MyCompany" in the version file "/var/lib/ambari-server/resources/version"
> 
> This postfix text causes the "ambari-server upgrade" cmd to fail with an int parser err thrown from the python script
> 
> INFO: Loading properties from /etc/ambari-server/conf/ambari.properties
> Traceback (most recent call last):
> File "/usr/sbin/ambari-server.py", line 608, in <module>
> mainBody()
> File "/usr/sbin/ambari-server.py", line 596, in mainBody
> main(options, args, parser)
> File "/usr/sbin/ambari-server.py", line 562, in main
> action_obj.execute()
> File "/usr/sbin/ambari-server.py", line 58, in execute
> self.fn(*self.args, **self.kwargs)
> File "/usr/lib/python2.6/site-packages/ambari_server/serverUpgrade.py", line 320, in upgrade
> elif compare_versions(ambari_version, "2.0.0") == 0:
> File "/usr/lib/python2.6/site-packages/ambari_server/utils.py", line 248, in compare_versions
> return cmp(normalize(version1), normalize(version2))
> File "/usr/lib/python2.6/site-packages/ambari_server/utils.py", line 247, in normalize
> return [int(x) for x in re.sub(r'(.0+)*$', '', v).split(".")]
> ValueError: invalid literal for int() with base 10: '0_MyCompany'
> 
> 
> Diffs
> -----
> 
>   ambari-server/src/main/python/ambari_server/utils.py f09a95c 
>   ambari-server/src/test/python/TestUtils.py bbd40bf 
> 
> Diff: https://reviews.apache.org/r/34269/diff/
> 
> 
> Testing
> -------
> 
> test_compare_versions (TestUtils.TestUtils) ... ok
> ... ...
> ----------------------------------------------------------------------
> Ran 265 tests in 7.355s
> 
> OK
> ----------------------------------------------------------------------
> Total run:773
> Total errors:0
> Total failures:0
> 
> 
> Thanks,
> 
> Di Li
> 
>


--===============5385933321845423865==--