Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1728390A8 for ; Sat, 31 Mar 2012 08:19:39 +0000 (UTC) Received: (qmail 18465 invoked by uid 500); 31 Mar 2012 08:19:39 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 17973 invoked by uid 500); 31 Mar 2012 08:19:32 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 17943 invoked by uid 99); 31 Mar 2012 08:19:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 08:19:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Sat, 31 Mar 2012 08:19:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 467B32388865 for ; Sat, 31 Mar 2012 08:19:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307739 - in /hadoop/common/branches/branch-1: CHANGES.txt src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java Date: Sat, 31 Mar 2012 08:19:08 -0000 To: common-commits@hadoop.apache.org From: ravigummadi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120331081908.467B32388865@eris.apache.org> Author: ravigummadi Date: Sat Mar 31 08:19:07 2012 New Revision: 1307739 URL: http://svn.apache.org/viewvc?rev=1307739&view=rev Log: MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi) Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1307739&r1=1307738&r2=1307739&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Sat Mar 31 08:19:07 2012 @@ -81,6 +81,9 @@ Release 1.1.0 - unreleased BUG FIXES + MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can + become slow in some cases (ravigummadi) + HDFS-2305. Running multiple 2NNs can result in corrupt file system. (atm) HADOOP-7634. Docs specify wrong owner for task-controller.cfg (eli) Modified: hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java?rev=1307739&r1=1307738&r2=1307739&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java (original) +++ hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java Sat Mar 31 08:19:07 2012 @@ -155,10 +155,11 @@ class GenerateDistCacheData extends Grid FSDataOutputStream dos = FileSystem.create(fs, path, new FsPermission((short)0755)); - for (long bytes = key.get(); bytes > 0; bytes -= val.getLength()) { + int size = 0; + for (long bytes = key.get(); bytes > 0; bytes -= size) { r.nextBytes(val.getBytes()); - val.setSize((int)Math.min(val.getLength(), bytes)); - dos.write(val.getBytes(), 0, val.getLength());// Write to distCache file + size = (int)Math.min(val.getLength(), bytes); + dos.write(val.getBytes(), 0, size);// Write to distCache file } dos.close(); }