Author: aching
Date: Fri Aug 31 18:34:17 2012
New Revision: 1379545
URL: http://svn.apache.org/viewvc?rev=1379545&view=rev
Log:
GIRAPH-319: Receiving two responses for a request causes an
exception. (apresta via aching)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java
giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1379545&r1=1379544&r2=1379545&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Fri Aug 31 18:34:17 2012
@@ -1,6 +1,10 @@
Giraph Change Log
Release 0.2.0 - unreleased
+
+ GIRAPH-319: Receiving two responses for a request causes an
+ exception. (apresta via aching)
+
GIRAPH-291: PredicateLock should have a constructor to take in a
custom waiting time and additional testing (aching via ereisman)
Modified:
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java?rev=1379545&r1=1379544&r2=1379545&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java
Fri Aug 31 18:34:17 2012
@@ -18,9 +18,6 @@
package org.apache.giraph.comm.netty.handler;
-import java.io.IOException;
-import java.util.concurrent.ConcurrentMap;
-
import org.apache.giraph.graph.GiraphJob;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
@@ -32,6 +29,9 @@ import org.jboss.netty.channel.Exception
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import java.io.IOException;
+import java.util.concurrent.ConcurrentMap;
+
/**
* Generic handler of responses.
*/
@@ -108,8 +108,8 @@ public class ResponseClientHandler exten
RequestInfo requestInfo = workerIdOutstandingRequestMap.remove(
new ClientRequestId(senderId, requestId));
if (requestInfo == null) {
- throw new IllegalStateException("messageReceived: Impossible to " +
- "have a non-registered requestId " + requestId);
+ LOG.info("messageReceived: Already received response for request id = " +
+ requestId);
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("messageReceived: Processed request id = " + requestId +
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java?rev=1379545&r1=1379544&r2=1379545&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java Fri Aug
31 18:34:17 2012
@@ -203,7 +203,7 @@ public class GiraphJob {
public static final String MAX_REQUEST_MILLISECONDS =
"giraph.maxRequestMilliseconds";
/** Maximum number of milliseconds for a request to complete */
- public static final int MAX_REQUEST_MILLISECONDS_DEFAULT = 60 * 1000;
+ public static final int MAX_REQUEST_MILLISECONDS_DEFAULT = 600 * 1000;
/** Netty max connection failures */
public static final String NETTY_MAX_CONNECTION_FAILURES =
