Author: ereisman
Date: Sun Sep 9 05:09:00 2012
New Revision: 1382399
URL: http://svn.apache.org/viewvc?rev=1382399&view=rev
Log:
GIRAPH-320: Provide a runtime configuration for choosing the log level (aching
via ereisman)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/graph/BspService.java
giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java
giraph/trunk/src/main/java/org/apache/giraph/graph/GraphMapper.java
giraph/trunk/src/main/java/org/apache/giraph/io/PseudoRandomVertexInputFormat.java
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1382399&r1=1382398&r2=1382399&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Sun Sep 9 05:09:00 2012
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-320: Provide a runtime configuration for choosing the
+ log level (aching via ereisman)
GIRAPH-321: Divide by 0 exception. (ereisman via aching)
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/BspService.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/BspService.java?rev=1382399&r1=1382398&r2=1382399&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/BspService.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/BspService.java Sun Sep
9 05:09:00 2012
@@ -379,8 +379,8 @@ public abstract class BspService<I exten
"getSuperstepFromPath: Cannot find end of superstep from " +
path);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("getSuperstepFromPath: Got path=" + path +
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("getSuperstepFromPath: Got path=" + path +
", start=" + foundSuperstepStart + ", end=" + endIndex);
}
return Long.parseLong(path.substring(foundSuperstepStart, endIndex));
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=1382399&r1=1382398&r2=1382399&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 Sun Sep
9 05:09:00 2012
@@ -103,6 +103,11 @@ public class GiraphJob {
/** not in local test mode per default */
public static final boolean LOCAL_TEST_MODE_DEFAULT = false;
+ /** Override the Hadoop log level and set the desired log level. */
+ public static final String LOG_LEVEL = "giraph.logLevel";
+ /** Default log level is INFO (same as Hadoop) */
+ public static final String LOG_LEVEL_DEFAULT = "info";
+
/**
* Minimum percent of the maximum number of workers that have responded
* in order to continue progressing. (float)
@@ -202,8 +207,8 @@ public class GiraphJob {
/** Milliseconds for a request to complete (or else resend) */
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 = 600 * 1000;
+ /** Maximum number of milliseconds for a request to complete (10 minutes) */
+ public static final int MAX_REQUEST_MILLISECONDS_DEFAULT = 10 * 60 * 1000;
/** Netty max connection failures */
public static final String NETTY_MAX_CONNECTION_FAILURES =
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/GraphMapper.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/GraphMapper.java?rev=1382399&r1=1382398&r2=1382399&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/GraphMapper.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/GraphMapper.java Sun Sep
9 05:09:00 2012
@@ -34,6 +34,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import com.google.common.collect.Iterables;
@@ -276,6 +277,14 @@ public class GraphMapper<I extends Writa
// set pre-validated generic parameter types into Configuration
determineClassTypes(conf);
+ // Set the log level
+ String logLevel =
+ conf.get(GiraphJob.LOG_LEVEL, GiraphJob.LOG_LEVEL_DEFAULT);
+ Logger.getRootLogger().setLevel(Level.toLevel(logLevel));
+ if (LOG.isInfoEnabled()) {
+ LOG.info("setup: Set log level to " + logLevel);
+ }
+
// Do some initial setup (possibly starting up a Zookeeper service)
context.setStatus("setup: Initializing Zookeeper services.");
if (!conf.getBoolean(GiraphJob.LOCAL_TEST_MODE,
Modified:
giraph/trunk/src/main/java/org/apache/giraph/io/PseudoRandomVertexInputFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/io/PseudoRandomVertexInputFormat.java?rev=1382399&r1=1382398&r2=1382399&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/io/PseudoRandomVertexInputFormat.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/io/PseudoRandomVertexInputFormat.java
Sun Sep 9 05:09:00 2012
@@ -172,8 +172,8 @@ public class PseudoRandomVertexInputForm
}
vertex.initialize(new LongWritable(vertexId), vertexValue, edges, null);
++verticesRead;
- if (LOG.isDebugEnabled()) {
- LOG.debug("next: Return vertexId=" +
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("next: Return vertexId=" +
vertex.getId().get() +
", vertexValue=" + vertex.getValue() +
", edges=" + vertex.getEdges());
