Return-Path: X-Original-To: apmail-hama-commits-archive@www.apache.org Delivered-To: apmail-hama-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 EC27217FFD for ; Tue, 30 Sep 2014 02:43:19 +0000 (UTC) Received: (qmail 97917 invoked by uid 500); 30 Sep 2014 02:43:19 -0000 Delivered-To: apmail-hama-commits-archive@hama.apache.org Received: (qmail 97884 invoked by uid 500); 30 Sep 2014 02:43:19 -0000 Mailing-List: contact commits-help@hama.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hama.apache.org Delivered-To: mailing list commits@hama.apache.org Received: (qmail 97873 invoked by uid 99); 30 Sep 2014 02:43:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2014 02:43:19 +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; Tue, 30 Sep 2014 02:42:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 043D623889E0; Tue, 30 Sep 2014 02:42:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1628356 - in /hama/trunk: ./ core/src/main/java/org/apache/hama/bsp/message/ core/src/main/java/org/apache/hama/ipc/ core/src/test/java/org/apache/hama/bsp/message/ core/src/test/java/org/apache/hama/ipc/ Date: Tue, 30 Sep 2014 02:42:54 -0000 To: commits@hama.apache.org From: bsmin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140930024255.043D623889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bsmin Date: Tue Sep 30 02:42:54 2014 New Revision: 1628356 URL: http://svn.apache.org/r1628356 Log: HAMA-913: correct the configuration of the subversion client(re-commit) Modified: hama/trunk/CHANGES.txt hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaAsyncMessageManagerImpl.java hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncClient.java hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncRPC.java hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncServer.java hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaAsyncMessageManager.java hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncIPC.java hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncRPC.java Modified: hama/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/CHANGES.txt (original) +++ hama/trunk/CHANGES.txt Tue Sep 30 02:42:54 2014 @@ -19,7 +19,6 @@ Release 0.7.0 (unreleased changes) IMPROVEMENTS HAMA-913: Add RPC implementation using netty(bsmin) HAMA-914: Boolean flag (isCompressed) is required only when runtime compression is enabled (edwardyoon) - HAMA-914: Boolean flag (isCompressed) is required only when runtime compression is enabled (edwardyoon) HAMA-910: Web UI Improvement (Victor Lee via edwardyoon) HAMA-909: Improve Mesos Scheduler's Fault Tolerance (Jeff Fenchel via edwardyoon) HAMA-823: Remove javadoc warnings (Victor Lee via edwardyoon) Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaAsyncMessageManagerImpl.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaAsyncMessageManagerImpl.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaAsyncMessageManagerImpl.java (original) +++ hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaAsyncMessageManagerImpl.java Tue Sep 30 02:42:54 2014 @@ -37,7 +37,7 @@ import org.apache.hama.ipc.AsyncServer; import org.apache.hama.util.LRUCache; /** - * Implementation of the {@link HamaMessageManager}. + * Implementation of the {@link HamaMessageManager} * */ public final class HamaAsyncMessageManagerImpl extends Modified: hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncClient.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncClient.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncClient.java (original) +++ hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncClient.java Tue Sep 30 02:42:54 2014 @@ -981,7 +981,7 @@ public class AsyncClient { /* * we could avoid this allocation for each RPC by having a connectionsId * object and with set() method. We need to manage the refs for keys in - * HashMap properly. For now its ok. + * HashMap properly. For now its ok */ do { connection = connections.get(remoteId); Modified: hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncRPC.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncRPC.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncRPC.java (original) +++ hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncRPC.java Tue Sep 30 02:42:54 2014 @@ -180,7 +180,7 @@ public class AsyncRPC { // connection pooling and leak sockets, or (b) use the same timeout for // all // configurations. Since the IPC is usually intended globally, not - // per-job, we choose (a). + // per-job, we choose (a) AsyncClient client = clients.get(factory); if (client == null) { client = new AsyncClient(ObjectWritable.class, conf, factory); Modified: hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncServer.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncServer.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncServer.java (original) +++ hama/trunk/core/src/main/java/org/apache/hama/ipc/AsyncServer.java Tue Sep 30 02:42:54 2014 @@ -77,7 +77,7 @@ public abstract class AsyncServer { // 4 : Introduced SASL security layer static final byte CURRENT_VERSION = 4; static final int HEADER_LENGTH = 10; - // follows version is read. + // follows version is read private Configuration conf; private final boolean tcpNoDelay; // if T then disable Nagle's Algorithm private int backlogLength;; Modified: hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaAsyncMessageManager.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaAsyncMessageManager.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaAsyncMessageManager.java (original) +++ hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaAsyncMessageManager.java Tue Sep 30 02:42:54 2014 @@ -42,7 +42,7 @@ public class TestHamaAsyncMessageManager public static final String TMP_OUTPUT_PATH = "/tmp/messageQueue"; // increment is here to solve race conditions in parallel execution to choose - // other ports. + // other ports public static volatile int increment = 1; public void testMemoryMessaging() throws Exception { Modified: hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncIPC.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncIPC.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncIPC.java (original) +++ hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncIPC.java Tue Sep 30 02:42:54 2014 @@ -98,7 +98,7 @@ public class TestAsyncIPC extends TestCa } } catch (Exception e) { - LOG.fatal("Caught: " + StringUtils.stringifyException(e)); + LOG.fatal("Caught : " + StringUtils.stringifyException(e)); failed = true; } } Modified: hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncRPC.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncRPC.java?rev=1628356&r1=1628355&r2=1628356&view=diff ============================================================================== --- hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncRPC.java (original) +++ hama/trunk/core/src/test/java/org/apache/hama/ipc/TestAsyncRPC.java Tue Sep 30 02:42:54 2014 @@ -34,7 +34,7 @@ public class TestAsyncRPC extends TestCa private static final String ADDRESS = "0.0.0.0"; public static final Log LOG = LogFactory - .getLog("org.apache.hama.ipc.TestRPCWithNetty"); + .getLog("org.apache.hama.ipc.TestAsyncRPC"); private static Configuration conf = new Configuration();