From tashi-commits-return-376-apmail-incubator-tashi-commits-archive=incubator.apache.org@incubator.apache.org Thu Feb 16 03:33:18 2012 Return-Path: X-Original-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 803B691A7 for ; Thu, 16 Feb 2012 03:33:18 +0000 (UTC) Received: (qmail 10467 invoked by uid 500); 16 Feb 2012 03:33:18 -0000 Delivered-To: apmail-incubator-tashi-commits-archive@incubator.apache.org Received: (qmail 10361 invoked by uid 500); 16 Feb 2012 03:33:14 -0000 Mailing-List: contact tashi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tashi-dev@incubator.apache.org Delivered-To: mailing list tashi-commits@incubator.apache.org Received: (qmail 10270 invoked by uid 99); 16 Feb 2012 03:33:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 03:33:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 03:33:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B3F222388900; Thu, 16 Feb 2012 03:32:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244839 - in /incubator/tashi/branches/stroucki-slotsbug: ./ src/tashi/client/tashi-client.py Date: Thu, 16 Feb 2012 03:32:44 -0000 To: tashi-commits@incubator.apache.org From: stroucki@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216033244.B3F222388900@eris.apache.org> Author: stroucki Date: Thu Feb 16 03:32:44 2012 New Revision: 1244839 URL: http://svn.apache.org/viewvc?rev=1244839&view=rev Log: tashi-client: test fix to calculate slots correctly if some hosts happen to be overprovisioned Added: incubator/tashi/branches/stroucki-slotsbug/ - copied from r1242468, incubator/tashi/trunk/ Modified: incubator/tashi/branches/stroucki-slotsbug/src/tashi/client/tashi-client.py Modified: incubator/tashi/branches/stroucki-slotsbug/src/tashi/client/tashi-client.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-slotsbug/src/tashi/client/tashi-client.py?rev=1244839&r1=1242468&r2=1244839&view=diff ============================================================================== --- incubator/tashi/branches/stroucki-slotsbug/src/tashi/client/tashi-client.py (original) +++ incubator/tashi/branches/stroucki-slotsbug/src/tashi/client/tashi-client.py Thu Feb 16 03:32:44 2012 @@ -166,7 +166,7 @@ def getSlots(cores, memory): continue countbycores = int((h.cores - h.usedCores) / cores) countbymemory = int((h.memory - h.usedMemory) / memory) - count += min(countbycores, countbymemory) + count += min(0, min(countbycores, countbymemory)) print "%d" % (count), print (lambda:"instances", lambda:"instance")[count == 1](),