You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2012/08/03 21:00:44 UTC
svn commit: r1369164 [2/4] - in
/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common:
./ dev-support/ src/ src/main/bin/ src/main/conf/ src/main/docs/
src/main/docs/src/documentation/content/xdocs/ src/main/java/
src/main/java/o...
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Touchz.java Fri Aug 3 19:00:15 2012
@@ -25,6 +25,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.shell.PathExceptions.PathIOException;
import org.apache.hadoop.fs.shell.PathExceptions.PathIsDirectoryException;
+import org.apache.hadoop.fs.shell.PathExceptions.PathNotFoundException;
/**
* Unix touch like commands
@@ -70,6 +71,9 @@ class Touch extends FsCommand {
@Override
protected void processNonexistentPath(PathData item) throws IOException {
+ if (!item.parentExists()) {
+ throw new PathNotFoundException(item.toString());
+ }
touchz(item);
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java Fri Aug 3 19:00:15 2012
@@ -55,6 +55,7 @@ import org.apache.hadoop.security.Creden
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.Time;
/**
* ViewFileSystem (extends the FileSystem interface) implements a client-side
@@ -146,7 +147,7 @@ public class ViewFileSystem extends File
*/
public ViewFileSystem() throws IOException {
ugi = UserGroupInformation.getCurrentUser();
- creationTime = System.currentTimeMillis();
+ creationTime = Time.now();
}
/**
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java Fri Aug 3 19:00:15 2012
@@ -55,6 +55,7 @@ import org.apache.hadoop.security.Access
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.Time;
/**
@@ -192,7 +193,7 @@ public class ViewFs extends AbstractFile
ViewFs(final URI theUri, final Configuration conf) throws IOException,
URISyntaxException {
super(theUri, FsConstants.VIEWFS_SCHEME, false, -1);
- creationTime = System.currentTimeMillis();
+ creationTime = Time.now();
ugi = UserGroupInformation.getCurrentUser();
config = conf;
// Now build client side view (i.e. client side mount table) from config.
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java Fri Aug 3 19:00:15 2012
@@ -154,6 +154,28 @@ public class IOUtils {
}
/**
+ * Utility wrapper for reading from {@link InputStream}. It catches any errors
+ * thrown by the underlying stream (either IO or decompression-related), and
+ * re-throws as an IOException.
+ *
+ * @param is - InputStream to be read from
+ * @param buf - buffer the data is read into
+ * @param off - offset within buf
+ * @param len - amount of data to be read
+ * @return number of bytes read
+ */
+ public static int wrappedReadForCompressedData(InputStream is, byte[] buf,
+ int off, int len) throws IOException {
+ try {
+ return is.read(buf, off, len);
+ } catch (IOException ie) {
+ throw ie;
+ } catch (Throwable t) {
+ throw new IOException("Error while reading compressed data", t);
+ }
+ }
+
+ /**
* Reads len bytes in a loop.
*
* @param in InputStream to read from
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java Fri Aug 3 19:00:15 2012
@@ -47,6 +47,7 @@ import org.apache.hadoop.util.Reflection
import org.apache.hadoop.util.NativeCodeLoader;
import org.apache.hadoop.util.MergeSort;
import org.apache.hadoop.util.PriorityQueue;
+import org.apache.hadoop.util.Time;
/**
* <code>SequenceFile</code>s are flat files consisting of binary key/value
@@ -835,7 +836,7 @@ public class SequenceFile {
{
try {
MessageDigest digester = MessageDigest.getInstance("MD5");
- long time = System.currentTimeMillis();
+ long time = Time.now();
digester.update((new UID()+"@"+time).getBytes());
sync = digester.digest();
} catch (Exception e) {
@@ -1160,8 +1161,26 @@ public class SequenceFile {
this.metadata = metadata;
SerializationFactory serializationFactory = new SerializationFactory(conf);
this.keySerializer = serializationFactory.getSerializer(keyClass);
+ if (this.keySerializer == null) {
+ throw new IOException(
+ "Could not find a serializer for the Key class: '"
+ + keyClass.getCanonicalName() + "'. "
+ + "Please ensure that the configuration '" +
+ CommonConfigurationKeys.IO_SERIALIZATIONS_KEY + "' is "
+ + "properly configured, if you're using"
+ + "custom serialization.");
+ }
this.keySerializer.open(buffer);
this.uncompressedValSerializer = serializationFactory.getSerializer(valClass);
+ if (this.uncompressedValSerializer == null) {
+ throw new IOException(
+ "Could not find a serializer for the Value class: '"
+ + valClass.getCanonicalName() + "'. "
+ + "Please ensure that the configuration '" +
+ CommonConfigurationKeys.IO_SERIALIZATIONS_KEY + "' is "
+ + "properly configured, if you're using"
+ + "custom serialization.");
+ }
this.uncompressedValSerializer.open(buffer);
if (this.codec != null) {
ReflectionUtils.setConf(this.codec, this.conf);
@@ -1170,6 +1189,15 @@ public class SequenceFile {
this.deflateOut =
new DataOutputStream(new BufferedOutputStream(deflateFilter));
this.compressedValSerializer = serializationFactory.getSerializer(valClass);
+ if (this.compressedValSerializer == null) {
+ throw new IOException(
+ "Could not find a serializer for the Value class: '"
+ + valClass.getCanonicalName() + "'. "
+ + "Please ensure that the configuration '" +
+ CommonConfigurationKeys.IO_SERIALIZATIONS_KEY + "' is "
+ + "properly configured, if you're using"
+ + "custom serialization.");
+ }
this.compressedValSerializer.open(deflateOut);
}
writeFileHeader();
@@ -1897,6 +1925,15 @@ public class SequenceFile {
new SerializationFactory(conf);
this.keyDeserializer =
getDeserializer(serializationFactory, getKeyClass());
+ if (this.keyDeserializer == null) {
+ throw new IOException(
+ "Could not find a deserializer for the Key class: '"
+ + getKeyClass().getCanonicalName() + "'. "
+ + "Please ensure that the configuration '" +
+ CommonConfigurationKeys.IO_SERIALIZATIONS_KEY + "' is "
+ + "properly configured, if you're using "
+ + "custom serialization.");
+ }
if (!blockCompressed) {
this.keyDeserializer.open(valBuffer);
} else {
@@ -1904,6 +1941,15 @@ public class SequenceFile {
}
this.valDeserializer =
getDeserializer(serializationFactory, getValueClass());
+ if (this.valDeserializer == null) {
+ throw new IOException(
+ "Could not find a deserializer for the Value class: '"
+ + getValueClass().getCanonicalName() + "'. "
+ + "Please ensure that the configuration '" +
+ CommonConfigurationKeys.IO_SERIALIZATIONS_KEY + "' is "
+ + "properly configured, if you're using "
+ + "custom serialization.");
+ }
this.valDeserializer.open(valIn);
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java Fri Aug 3 19:00:15 2012
@@ -127,6 +127,8 @@ public class BlockDecompressorStream ext
}
public void resetState() throws IOException {
+ originalBlockSize = 0;
+ noUncompressedBytes = 0;
super.resetState();
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java Fri Aug 3 19:00:15 2012
@@ -75,6 +75,7 @@ import org.apache.hadoop.security.token.
import org.apache.hadoop.security.token.TokenSelector;
import org.apache.hadoop.util.ProtoUtil;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Time;
/** A client for an IPC service. IPC calls take a single {@link Writable} as a
* parameter, and return a {@link Writable} as their value. A service runs on
@@ -316,7 +317,7 @@ public class Client {
/** Update lastActivity with the current time. */
private void touch() {
- lastActivity.set(System.currentTimeMillis());
+ lastActivity.set(Time.now());
}
/**
@@ -762,7 +763,7 @@ public class Client {
private synchronized boolean waitForWork() {
if (calls.isEmpty() && !shouldCloseConnection.get() && running.get()) {
long timeout = maxIdleTime-
- (System.currentTimeMillis()-lastActivity.get());
+ (Time.now()-lastActivity.get());
if (timeout>0) {
try {
wait(timeout);
@@ -792,7 +793,7 @@ public class Client {
* since last I/O activity is equal to or greater than the ping interval
*/
private synchronized void sendPing() throws IOException {
- long curTime = System.currentTimeMillis();
+ long curTime = Time.now();
if ( curTime - lastActivity.get() >= pingInterval) {
lastActivity.set(curTime);
synchronized (out) {
@@ -1398,5 +1399,10 @@ public class Client {
result = PRIME * result + ((ticket == null) ? 0 : ticket.hashCode());
return result;
}
+
+ @Override
+ public String toString() {
+ return serverPrincipal + "@" + address;
+ }
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java Fri Aug 3 19:00:15 2012
@@ -44,19 +44,21 @@ import org.apache.hadoop.security.UserGr
import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.util.ProtoUtil;
+import org.apache.hadoop.util.Time;
import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.BlockingService;
import com.google.protobuf.Descriptors.MethodDescriptor;
import com.google.protobuf.Message;
import com.google.protobuf.ServiceException;
+import com.google.protobuf.TextFormat;
/**
* RPC Engine for for protobuf based RPCs.
*/
@InterfaceStability.Evolving
public class ProtobufRpcEngine implements RpcEngine {
- private static final Log LOG = LogFactory.getLog(ProtobufRpcEngine.class);
+ public static final Log LOG = LogFactory.getLog(ProtobufRpcEngine.class);
static { // Register the rpcRequest deserializer for WritableRpcEngine
org.apache.hadoop.ipc.Server.registerProtocolEngine(
@@ -185,21 +187,34 @@ public class ProtobufRpcEngine implement
throws ServiceException {
long startTime = 0;
if (LOG.isDebugEnabled()) {
- startTime = System.currentTimeMillis();
+ startTime = Time.now();
}
HadoopRpcRequestProto rpcRequest = constructRpcRequest(method, args);
RpcResponseWritable val = null;
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(Thread.currentThread().getId() + ": Call -> " +
+ remoteId + ": " + method.getName() +
+ " {" + TextFormat.shortDebugString((Message) args[1]) + "}");
+ }
try {
val = (RpcResponseWritable) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER,
new RpcRequestWritable(rpcRequest), remoteId);
+
} catch (Throwable e) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(Thread.currentThread().getId() + ": Exception <- " +
+ remoteId + ": " + method.getName() +
+ " {" + e + "}");
+ }
+
throw new ServiceException(e);
}
if (LOG.isDebugEnabled()) {
- long callTime = System.currentTimeMillis() - startTime;
- LOG.debug("Call: " + method.getName() + " " + callTime);
+ long callTime = Time.now() - startTime;
+ LOG.debug("Call: " + method.getName() + " took " + callTime + "ms");
}
Message prototype = null;
@@ -212,6 +227,13 @@ public class ProtobufRpcEngine implement
try {
returnMessage = prototype.newBuilderForType()
.mergeFrom(val.responseMessage).build();
+
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(Thread.currentThread().getId() + ": Response <- " +
+ remoteId + ": " + method.getName() +
+ " {" + TextFormat.shortDebugString(returnMessage) + "}");
+ }
+
} catch (Throwable e) {
throw new ServiceException(e);
}
@@ -446,10 +468,10 @@ public class ProtobufRpcEngine implement
.mergeFrom(rpcRequest.getRequest()).build();
Message result;
try {
- long startTime = System.currentTimeMillis();
+ long startTime = Time.now();
server.rpcDetailedMetrics.init(protocolImpl.protocolClass);
result = service.callBlockingMethod(methodDescriptor, null, param);
- int processingTime = (int) (System.currentTimeMillis() - startTime);
+ int processingTime = (int) (Time.now() - startTime);
int qTime = (int) (startTime - receiveTime);
if (LOG.isDebugEnabled()) {
LOG.info("Served: " + methodName + " queueTime= " + qTime +
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java Fri Aug 3 19:00:15 2012
@@ -50,6 +50,7 @@ import org.apache.hadoop.security.token.
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Time;
import com.google.protobuf.BlockingService;
@@ -369,7 +370,7 @@ public class RPC {
int rpcTimeout,
RetryPolicy connectionRetryPolicy,
long timeout) throws IOException {
- long startTime = System.currentTimeMillis();
+ long startTime = Time.now();
IOException ioe;
while (true) {
try {
@@ -387,7 +388,7 @@ public class RPC {
ioe = nrthe;
}
// check if timed out
- if (System.currentTimeMillis()-timeout >= startTime) {
+ if (Time.now()-timeout >= startTime) {
throw ioe;
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Fri Aug 3 19:00:15 2012
@@ -95,6 +95,7 @@ import org.apache.hadoop.security.token.
import org.apache.hadoop.util.ProtoUtil;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.Time;
import com.google.common.annotations.VisibleForTesting;
@@ -411,7 +412,7 @@ public abstract class Server {
this.callId = id;
this.rpcRequest = param;
this.connection = connection;
- this.timestamp = System.currentTimeMillis();
+ this.timestamp = Time.now();
this.rpcResponse = null;
this.rpcKind = kind;
}
@@ -561,7 +562,7 @@ public abstract class Server {
*/
private void cleanupConnections(boolean force) {
if (force || numConnections > thresholdIdleConnections) {
- long currentTime = System.currentTimeMillis();
+ long currentTime = Time.now();
if (!force && (currentTime - lastCleanupRunTime) < cleanupInterval) {
return;
}
@@ -597,7 +598,7 @@ public abstract class Server {
}
else i++;
}
- lastCleanupRunTime = System.currentTimeMillis();
+ lastCleanupRunTime = Time.now();
}
}
@@ -682,7 +683,7 @@ public abstract class Server {
try {
reader.startAdd();
SelectionKey readKey = reader.registerChannel(channel);
- c = new Connection(readKey, channel, System.currentTimeMillis());
+ c = new Connection(readKey, channel, Time.now());
readKey.attach(c);
synchronized (connectionList) {
connectionList.add(numConnections, c);
@@ -704,7 +705,7 @@ public abstract class Server {
if (c == null) {
return;
}
- c.setLastContact(System.currentTimeMillis());
+ c.setLastContact(Time.now());
try {
count = c.readAndProcess();
@@ -726,7 +727,7 @@ public abstract class Server {
c = null;
}
else {
- c.setLastContact(System.currentTimeMillis());
+ c.setLastContact(Time.now());
}
}
@@ -805,7 +806,7 @@ public abstract class Server {
LOG.info(getName() + ": doAsyncWrite threw exception " + e);
}
}
- long now = System.currentTimeMillis();
+ long now = Time.now();
if (now < lastPurgeTime + PURGE_INTERVAL) {
continue;
}
@@ -951,7 +952,7 @@ public abstract class Server {
if (inHandler) {
// set the serve time when the response has to be sent later
- call.timestamp = System.currentTimeMillis();
+ call.timestamp = Time.now();
incPending();
try {
@@ -1642,7 +1643,7 @@ public abstract class Server {
if (!channel.isOpen())
return;
try {socket.shutdownOutput();} catch(Exception e) {
- LOG.warn("Ignoring socket shutdown exception");
+ LOG.debug("Ignoring socket shutdown exception", e);
}
if (channel.isOpen()) {
try {channel.close();} catch(Exception e) {}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java Fri Aug 3 19:00:15 2012
@@ -37,6 +37,7 @@ import org.apache.hadoop.ipc.VersionedPr
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.TokenIdentifier;
+import org.apache.hadoop.util.Time;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
@@ -218,13 +219,13 @@ public class WritableRpcEngine implement
throws Throwable {
long startTime = 0;
if (LOG.isDebugEnabled()) {
- startTime = System.currentTimeMillis();
+ startTime = Time.now();
}
ObjectWritable value = (ObjectWritable)
client.call(RPC.RpcKind.RPC_WRITABLE, new Invocation(method, args), remoteId);
if (LOG.isDebugEnabled()) {
- long callTime = System.currentTimeMillis() - startTime;
+ long callTime = Time.now() - startTime;
LOG.debug("Call: " + method.getName() + " " + callTime);
}
return value.get();
@@ -464,7 +465,7 @@ public class WritableRpcEngine implement
// Invoke the protocol method
- long startTime = System.currentTimeMillis();
+ long startTime = Time.now();
Method method =
protocolImpl.protocolClass.getMethod(call.getMethodName(),
call.getParameterClasses());
@@ -472,7 +473,7 @@ public class WritableRpcEngine implement
server.rpcDetailedMetrics.init(protocolImpl.protocolClass);
Object value =
method.invoke(protocolImpl.protocolImpl, call.getParameters());
- int processingTime = (int) (System.currentTimeMillis() - startTime);
+ int processingTime = (int) (Time.now() - startTime);
int qTime = (int) (startTime-receivedTime);
if (LOG.isDebugEnabled()) {
LOG.debug("Served: " + call.getMethodName() +
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java Fri Aug 3 19:00:15 2012
@@ -60,12 +60,14 @@ public class MetricsServlet extends Http
this.metricMap = metricMap;
}
+ @Override
@SuppressWarnings("unchecked")
public void fromJSON(Map map) {
throw new UnsupportedOperationException();
}
/** Converts to JSON by providing an array. */
+ @Override
public void toJSON(Output out) {
out.add(new Object[] { tagMap, metricMap });
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsUtil.java Fri Aug 3 19:00:15 2012
@@ -93,8 +93,7 @@ public class MetricsUtil {
String hostName = null;
try {
hostName = InetAddress.getLocalHost().getHostName();
- }
- catch (UnknownHostException ex) {
+ } catch (UnknownHostException ex) {
LOG.info("Unable to obtain hostName", ex);
hostName = "unknown";
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/file/FileContext.java Fri Aug 3 19:00:15 2012
@@ -62,6 +62,7 @@ public class FileContext extends Abstrac
@InterfaceAudience.Private
public FileContext() {}
+ @Override
@InterfaceAudience.Private
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -92,6 +93,7 @@ public class FileContext extends Abstrac
* if specified. Otherwise the data will be written to standard
* output.
*/
+ @Override
@InterfaceAudience.Private
public void startMonitoring()
throws IOException
@@ -108,6 +110,7 @@ public class FileContext extends Abstrac
* Stops monitoring, closing the file.
* @see #close()
*/
+ @Override
@InterfaceAudience.Private
public void stopMonitoring() {
super.stopMonitoring();
@@ -121,6 +124,7 @@ public class FileContext extends Abstrac
/**
* Emits a metrics record to a file.
*/
+ @Override
@InterfaceAudience.Private
public void emitRecord(String contextName, String recordName, OutputRecord outRec) {
writer.print(contextName);
@@ -147,6 +151,7 @@ public class FileContext extends Abstrac
/**
* Flushes the output writer, forcing updates to disk.
*/
+ @Override
@InterfaceAudience.Private
public void flush() {
writer.flush();
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Fri Aug 3 19:00:15 2012
@@ -91,6 +91,7 @@ public class GangliaContext extends Abst
public GangliaContext() {
}
+ @Override
@InterfaceAudience.Private
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -106,8 +107,7 @@ public class GangliaContext extends Abst
try {
datagramSocket = new DatagramSocket();
- }
- catch (SocketException se) {
+ } catch (SocketException se) {
se.printStackTrace();
}
}
@@ -123,6 +123,7 @@ public class GangliaContext extends Abst
}
}
+ @Override
@InterfaceAudience.Private
public void emitRecord(String contextName, String recordName,
OutputRecord outRec)
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext31.java Fri Aug 3 19:00:15 2012
@@ -43,6 +43,7 @@ public class GangliaContext31 extends Ga
private static final Log LOG =
LogFactory.getLog("org.apache.hadoop.util.GangliaContext31");
+ @Override
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -66,6 +67,7 @@ public class GangliaContext31 extends Ga
}
}
+ @Override
protected void emitMetric(String name, String type, String value)
throws IOException
{
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java Fri Aug 3 19:00:15 2012
@@ -94,6 +94,7 @@ public class JvmMetrics implements Updat
* This will be called periodically (with the period being configuration
* dependent).
*/
+ @Override
public void doUpdates(MetricsContext context) {
doMemoryUpdates();
doGarbageCollectionUpdates();
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java Fri Aug 3 19:00:15 2012
@@ -116,6 +116,7 @@ public abstract class AbstractMetricsCon
/**
* Initializes the context.
*/
+ @Override
public void init(String contextName, ContextFactory factory)
{
this.contextName = contextName;
@@ -152,6 +153,7 @@ public abstract class AbstractMetricsCon
/**
* Returns the context name.
*/
+ @Override
public String getContextName() {
return contextName;
}
@@ -166,6 +168,7 @@ public abstract class AbstractMetricsCon
/**
* Starts or restarts monitoring, the emitting of metrics records.
*/
+ @Override
public synchronized void startMonitoring()
throws IOException {
if (!isMonitoring) {
@@ -178,6 +181,7 @@ public abstract class AbstractMetricsCon
* Stops monitoring. This does not free buffered data.
* @see #close()
*/
+ @Override
public synchronized void stopMonitoring() {
if (isMonitoring) {
stopTimer();
@@ -188,6 +192,7 @@ public abstract class AbstractMetricsCon
/**
* Returns true if monitoring is currently in progress.
*/
+ @Override
public boolean isMonitoring() {
return isMonitoring;
}
@@ -196,6 +201,7 @@ public abstract class AbstractMetricsCon
* Stops monitoring and frees buffered data, returning this
* object to its initial state.
*/
+ @Override
public synchronized void close() {
stopMonitoring();
clearUpdaters();
@@ -209,6 +215,7 @@ public abstract class AbstractMetricsCon
* @param recordName the name of the record
* @throws MetricsException if recordName conflicts with configuration data
*/
+ @Override
public final synchronized MetricsRecord createRecord(String recordName) {
if (bufferedData.get(recordName) == null) {
bufferedData.put(recordName, new RecordMap());
@@ -232,6 +239,7 @@ public abstract class AbstractMetricsCon
* @param updater object to be run periodically; it should update
* some metrics records
*/
+ @Override
public synchronized void registerUpdater(final Updater updater) {
if (!updaters.contains(updater)) {
updaters.add(updater);
@@ -243,6 +251,7 @@ public abstract class AbstractMetricsCon
*
* @param updater object to be removed from the callback list
*/
+ @Override
public synchronized void unregisterUpdater(Updater updater) {
updaters.remove(updater);
}
@@ -259,11 +268,11 @@ public abstract class AbstractMetricsCon
timer = new Timer("Timer thread for monitoring " + getContextName(),
true);
TimerTask task = new TimerTask() {
+ @Override
public void run() {
try {
timerEvent();
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
ioe.printStackTrace();
}
}
@@ -297,8 +306,7 @@ public abstract class AbstractMetricsCon
for (Updater updater : myUpdaters) {
try {
updater.doUpdates(this);
- }
- catch (Throwable throwable) {
+ } catch (Throwable throwable) {
throwable.printStackTrace();
}
}
@@ -328,6 +336,7 @@ public abstract class AbstractMetricsCon
* Useful for monitoring systems that are polling-based.
* @return A non-null collection of all monitoring records.
*/
+ @Override
public synchronized Map<String, Collection<OutputRecord>> getAllRecords() {
Map<String, Collection<OutputRecord>> out = new TreeMap<String, Collection<OutputRecord>>();
for (String recordName : bufferedData.keySet()) {
@@ -449,6 +458,7 @@ public abstract class AbstractMetricsCon
/**
* Returns the timer period.
*/
+ @Override
public int getPeriod() {
return period;
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java Fri Aug 3 19:00:15 2012
@@ -49,6 +49,7 @@ public class CompositeContext extends Ab
public CompositeContext() {
}
+ @Override
@InterfaceAudience.Private
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -186,6 +187,7 @@ public class CompositeContext extends Ab
}
}
+ @Override
public Object invoke(Object p, Method m, Object[] args) throws Throwable {
if (m_getRecordName.equals(m)) {
return recordName;
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java Fri Aug 3 19:00:15 2012
@@ -57,6 +57,7 @@ public class MetricsRecordImpl implement
*
* @return the record name
*/
+ @Override
public String getRecordName() {
return recordName;
}
@@ -68,6 +69,7 @@ public class MetricsRecordImpl implement
* @param tagValue new value of the tag
* @throws MetricsException if the tagName conflicts with the configuration
*/
+ @Override
public void setTag(String tagName, String tagValue) {
if (tagValue == null) {
tagValue = "";
@@ -82,6 +84,7 @@ public class MetricsRecordImpl implement
* @param tagValue new value of the tag
* @throws MetricsException if the tagName conflicts with the configuration
*/
+ @Override
public void setTag(String tagName, int tagValue) {
tagTable.put(tagName, Integer.valueOf(tagValue));
}
@@ -93,6 +96,7 @@ public class MetricsRecordImpl implement
* @param tagValue new value of the tag
* @throws MetricsException if the tagName conflicts with the configuration
*/
+ @Override
public void setTag(String tagName, long tagValue) {
tagTable.put(tagName, Long.valueOf(tagValue));
}
@@ -104,6 +108,7 @@ public class MetricsRecordImpl implement
* @param tagValue new value of the tag
* @throws MetricsException if the tagName conflicts with the configuration
*/
+ @Override
public void setTag(String tagName, short tagValue) {
tagTable.put(tagName, Short.valueOf(tagValue));
}
@@ -115,6 +120,7 @@ public class MetricsRecordImpl implement
* @param tagValue new value of the tag
* @throws MetricsException if the tagName conflicts with the configuration
*/
+ @Override
public void setTag(String tagName, byte tagValue) {
tagTable.put(tagName, Byte.valueOf(tagValue));
}
@@ -122,6 +128,7 @@ public class MetricsRecordImpl implement
/**
* Removes any tag of the specified name.
*/
+ @Override
public void removeTag(String tagName) {
tagTable.remove(tagName);
}
@@ -134,6 +141,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void setMetric(String metricName, int metricValue) {
setAbsolute(metricName, Integer.valueOf(metricValue));
}
@@ -146,6 +154,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void setMetric(String metricName, long metricValue) {
setAbsolute(metricName, Long.valueOf(metricValue));
}
@@ -158,6 +167,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void setMetric(String metricName, short metricValue) {
setAbsolute(metricName, Short.valueOf(metricValue));
}
@@ -170,6 +180,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void setMetric(String metricName, byte metricValue) {
setAbsolute(metricName, Byte.valueOf(metricValue));
}
@@ -182,6 +193,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void setMetric(String metricName, float metricValue) {
setAbsolute(metricName, new Float(metricValue));
}
@@ -194,6 +206,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void incrMetric(String metricName, int metricValue) {
setIncrement(metricName, Integer.valueOf(metricValue));
}
@@ -206,6 +219,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void incrMetric(String metricName, long metricValue) {
setIncrement(metricName, Long.valueOf(metricValue));
}
@@ -218,6 +232,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void incrMetric(String metricName, short metricValue) {
setIncrement(metricName, Short.valueOf(metricValue));
}
@@ -230,6 +245,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void incrMetric(String metricName, byte metricValue) {
setIncrement(metricName, Byte.valueOf(metricValue));
}
@@ -242,6 +258,7 @@ public class MetricsRecordImpl implement
* @throws MetricsException if the metricName or the type of the metricValue
* conflicts with the configuration
*/
+ @Override
public void incrMetric(String metricName, float metricValue) {
setIncrement(metricName, new Float(metricValue));
}
@@ -259,6 +276,7 @@ public class MetricsRecordImpl implement
* If the tag values match an existing row, that row is updated;
* otherwise, a new row is added.
*/
+ @Override
public void update() {
context.update(this);
}
@@ -267,6 +285,7 @@ public class MetricsRecordImpl implement
* Removes the row, if it exists, in the buffered data table having tags
* that equal the tags that have been set on this record.
*/
+ @Override
public void remove() {
context.remove(this);
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java Fri Aug 3 19:00:15 2012
@@ -40,6 +40,7 @@ public class NoEmitMetricsContext extend
public NoEmitMetricsContext() {
}
+ @Override
@InterfaceAudience.Private
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -49,6 +50,7 @@ public class NoEmitMetricsContext extend
/**
* Do-nothing version of emitRecord
*/
+ @Override
@InterfaceAudience.Private
protected void emitRecord(String contextName, String recordName,
OutputRecord outRec) {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContext.java Fri Aug 3 19:00:15 2012
@@ -40,6 +40,7 @@ public class NullContext extends Abstrac
/**
* Do-nothing version of startMonitoring
*/
+ @Override
@InterfaceAudience.Private
public void startMonitoring() {
}
@@ -47,6 +48,7 @@ public class NullContext extends Abstrac
/**
* Do-nothing version of emitRecord
*/
+ @Override
@InterfaceAudience.Private
protected void emitRecord(String contextName, String recordName,
OutputRecord outRec)
@@ -55,6 +57,7 @@ public class NullContext extends Abstrac
/**
* Do-nothing version of update
*/
+ @Override
@InterfaceAudience.Private
protected void update(MetricsRecordImpl record) {
}
@@ -62,6 +65,7 @@ public class NullContext extends Abstrac
/**
* Do-nothing version of remove
*/
+ @Override
@InterfaceAudience.Private
protected void remove(MetricsRecordImpl record) {
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java Fri Aug 3 19:00:15 2012
@@ -46,6 +46,7 @@ public class NullContextWithUpdateThread
public NullContextWithUpdateThread() {
}
+ @Override
@InterfaceAudience.Private
public void init(String contextName, ContextFactory factory) {
super.init(contextName, factory);
@@ -56,6 +57,7 @@ public class NullContextWithUpdateThread
/**
* Do-nothing version of emitRecord
*/
+ @Override
@InterfaceAudience.Private
protected void emitRecord(String contextName, String recordName,
OutputRecord outRec)
@@ -64,6 +66,7 @@ public class NullContextWithUpdateThread
/**
* Do-nothing version of update
*/
+ @Override
@InterfaceAudience.Private
protected void update(MetricsRecordImpl record) {
}
@@ -71,6 +74,7 @@ public class NullContextWithUpdateThread
/**
* Do-nothing version of remove
*/
+ @Override
@InterfaceAudience.Private
protected void remove(MetricsRecordImpl record) {
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java Fri Aug 3 19:00:15 2012
@@ -92,6 +92,7 @@ public class MetricsIntValue extends Met
*
* @param mr
*/
+ @Override
public synchronized void pushMetric(final MetricsRecord mr) {
if (changed) {
try {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsLongValue.java Fri Aug 3 19:00:15 2012
@@ -82,6 +82,7 @@ public class MetricsLongValue extends Me
*
* @param mr
*/
+ @Override
public synchronized void pushMetric(final MetricsRecord mr) {
if (changed)
mr.setMetric(getName(), value);
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java Fri Aug 3 19:00:15 2012
@@ -101,6 +101,7 @@ public class MetricsTimeVaryingInt exten
*
* @param mr
*/
+ @Override
public synchronized void pushMetric(final MetricsRecord mr) {
intervalHeartBeat();
try {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java Fri Aug 3 19:00:15 2012
@@ -97,6 +97,7 @@ public class MetricsTimeVaryingLong exte
*
* @param mr
*/
+ @Override
public synchronized void pushMetric(final MetricsRecord mr) {
intervalHeartBeat();
try {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Fri Aug 3 19:00:15 2012
@@ -144,6 +144,7 @@ public class MetricsTimeVaryingRate exte
*
* @param mr
*/
+ @Override
public synchronized void pushMetric(final MetricsRecord mr) {
intervalHeartBeat();
try {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java Fri Aug 3 19:00:15 2012
@@ -114,8 +114,7 @@ class MetricsConfig extends SubsetConfig
MetricsConfig mc = new MetricsConfig(cf, prefix);
LOG.debug(mc);
return mc;
- }
- catch (ConfigurationException e) {
+ } catch (ConfigurationException e) {
if (e.getMessage().startsWith("Cannot locate configuration")) {
continue;
}
@@ -198,8 +197,7 @@ class MetricsConfig extends SubsetConfig
T plugin = (T) cls.newInstance();
plugin.init(name.isEmpty() ? this : subset(name));
return plugin;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new MetricsConfigException("Error creating plugin: "+ clsName, e);
}
}
@@ -229,8 +227,7 @@ class MetricsConfig extends SubsetConfig
LOG.debug(jar);
urls[i++] = new URL(jar);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new MetricsConfigException(e);
}
if (LOG.isDebugEnabled()) {
@@ -276,8 +273,9 @@ class MetricsConfig extends SubsetConfig
PrintStream ps = new PrintStream(buffer);
PropertiesConfiguration tmp = new PropertiesConfiguration();
tmp.copy(c);
- try { tmp.save(ps); }
- catch (Exception e) {
+ try {
+ tmp.save(ps);
+ } catch (Exception e) {
throw new MetricsConfigException(e);
}
return buffer.toString();
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java Fri Aug 3 19:00:15 2012
@@ -30,6 +30,7 @@ import org.apache.hadoop.metrics2.Metric
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsTag;
import org.apache.hadoop.metrics2.lib.Interns;
+import org.apache.hadoop.util.Time;
class MetricsRecordBuilderImpl extends MetricsRecordBuilder {
private final MetricsCollector parent;
@@ -44,7 +45,7 @@ class MetricsRecordBuilderImpl extends M
MetricsFilter rf, MetricsFilter mf,
boolean acceptable) {
this.parent = parent;
- timestamp = System.currentTimeMillis();
+ timestamp = Time.now();
recInfo = info;
metrics = Lists.newArrayList();
tags = Lists.newArrayList();
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java Fri Aug 3 19:00:15 2012
@@ -32,6 +32,7 @@ import org.apache.hadoop.metrics2.Metric
import static org.apache.hadoop.metrics2.util.Contracts.*;
import org.apache.hadoop.metrics2.MetricsFilter;
import org.apache.hadoop.metrics2.MetricsSink;
+import org.apache.hadoop.util.Time;
/**
* An adapter class for metrics sink and associated filters
@@ -106,11 +107,9 @@ class MetricsSinkAdapter implements Sink
retryDelay = firstRetryDelay;
n = retryCount;
inError = false;
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
LOG.info(name +" thread interrupted.");
- }
- catch (Exception e) {
+ } catch (Exception e) {
if (n > 0) {
int retryWindow = Math.max(0, 1000 / 2 * retryDelay - minDelay);
int awhile = rng.nextInt(retryWindow) + minDelay;
@@ -123,8 +122,7 @@ class MetricsSinkAdapter implements Sink
LOG.info(name +" thread interrupted while waiting for retry", e2);
}
--n;
- }
- else {
+ } else {
if (!inError) {
LOG.error("Got sink exception and over retry limit, "+
"suppressing further error messages", e);
@@ -158,7 +156,7 @@ class MetricsSinkAdapter implements Sink
}
if (ts > 0) {
sink.flush();
- latency.add(System.currentTimeMillis() - ts);
+ latency.add(Time.now() - ts);
}
LOG.debug("Done");
}
@@ -173,8 +171,7 @@ class MetricsSinkAdapter implements Sink
sinkThread.interrupt();
try {
sinkThread.join();
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
LOG.warn("Stop interrupted", e);
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java Fri Aug 3 19:00:15 2012
@@ -40,6 +40,8 @@ import org.apache.hadoop.metrics2.Metric
import org.apache.hadoop.metrics2.MetricsTag;
import static org.apache.hadoop.metrics2.impl.MetricsConfig.*;
import org.apache.hadoop.metrics2.util.MBeans;
+import org.apache.hadoop.util.Time;
+
import static org.apache.hadoop.metrics2.util.Contracts.*;
/**
@@ -152,9 +154,9 @@ class MetricsSourceAdapter implements Dy
private void updateJmxCache() {
boolean getAllMetrics = false;
synchronized(this) {
- if (System.currentTimeMillis() - jmxCacheTS >= jmxCacheTTL) {
+ if (Time.now() - jmxCacheTS >= jmxCacheTTL) {
// temporarilly advance the expiry while updating the cache
- jmxCacheTS = System.currentTimeMillis() + jmxCacheTTL;
+ jmxCacheTS = Time.now() + jmxCacheTTL;
if (lastRecs == null) {
getAllMetrics = true;
}
@@ -175,7 +177,7 @@ class MetricsSourceAdapter implements Dy
if (oldCacheSize < newCacheSize) {
updateInfoCache();
}
- jmxCacheTS = System.currentTimeMillis();
+ jmxCacheTS = Time.now();
lastRecs = null; // in case regular interval update is not running
}
}
@@ -190,8 +192,7 @@ class MetricsSourceAdapter implements Dy
}
try {
source.getMetrics(builder, all);
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.error("Error getting metrics from source "+ name, e);
}
for (MetricsRecordBuilderImpl rb : builder) {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java Fri Aug 3 19:00:15 2012
@@ -60,6 +60,7 @@ import org.apache.hadoop.metrics2.lib.Me
import org.apache.hadoop.metrics2.lib.MetricsSourceBuilder;
import org.apache.hadoop.metrics2.lib.MutableStat;
import org.apache.hadoop.metrics2.util.MBeans;
+import org.apache.hadoop.util.Time;
/**
* A base class for metrics system singletons
@@ -286,8 +287,7 @@ public class MetricsSystemImpl extends M
throws Throwable {
try {
return method.invoke(callback, args);
- }
- catch (Exception e) {
+ } catch (Exception e) {
// These are not considered fatal.
LOG.warn("Caught exception in callback "+ method.getName(), e);
}
@@ -331,11 +331,11 @@ public class MetricsSystemImpl extends M
long millis = period * 1000;
timer = new Timer("Timer for '"+ prefix +"' metrics system", true);
timer.scheduleAtFixedRate(new TimerTask() {
+ @Override
public void run() {
try {
onTimerEvent();
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.warn(e);
}
}
@@ -372,10 +372,10 @@ public class MetricsSystemImpl extends M
private void snapshotMetrics(MetricsSourceAdapter sa,
MetricsBufferBuilder bufferBuilder) {
- long startTime = System.currentTimeMillis();
+ long startTime = Time.now();
bufferBuilder.add(sa.name(), sa.getMetrics(collector, false));
collector.clear();
- snapshotStat.add(System.currentTimeMillis() - startTime);
+ snapshotStat.add(Time.now() - startTime);
LOG.debug("Snapshotted source "+ sa.name());
}
@@ -386,9 +386,9 @@ public class MetricsSystemImpl extends M
synchronized void publishMetrics(MetricsBuffer buffer) {
int dropped = 0;
for (MetricsSinkAdapter sa : sinks.values()) {
- long startTime = System.currentTimeMillis();
+ long startTime = Time.now();
dropped += sa.putMetrics(buffer, logicalTime) ? 0 : 1;
- publishStat.add(System.currentTimeMillis() - startTime);
+ publishStat.add(Time.now() - startTime);
}
droppedPubAll.incr(dropped);
}
@@ -450,8 +450,7 @@ public class MetricsSystemImpl extends M
conf.getString(DESC_KEY, sinkName), conf);
sa.start();
sinks.put(sinkName, sa);
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.warn("Error creating sink '"+ sinkName +"'", e);
}
}
@@ -493,8 +492,7 @@ public class MetricsSystemImpl extends M
static String getHostname() {
try {
return InetAddress.getLocalHost().getHostName();
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.error("Error getting localhost name. Using 'localhost'...", e);
}
return "localhost";
@@ -554,6 +552,7 @@ public class MetricsSystemImpl extends M
return true;
}
+ @Override
public MetricsSource getSource(String name) {
return allSources.get(name);
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java Fri Aug 3 19:00:15 2012
@@ -76,8 +76,7 @@ class MethodMetric extends MutableMetric
Object ret = method.invoke(obj, (Object[])null);
if (isInt(type)) rb.addCounter(info, ((Integer) ret).intValue());
else rb.addCounter(info, ((Long) ret).longValue());
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
LOG.error("Error invoking method "+ method.getName(), ex);
}
}
@@ -113,8 +112,7 @@ class MethodMetric extends MutableMetric
else if (isLong(t)) rb.addGauge(info, ((Long) ret).longValue());
else if (isFloat(t)) rb.addGauge(info, ((Float) ret).floatValue());
else rb.addGauge(info, ((Double) ret).doubleValue());
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
LOG.error("Error invoking method "+ method.getName(), ex);
}
}
@@ -130,8 +128,7 @@ class MethodMetric extends MutableMetric
try {
Object ret = method.invoke(obj, (Object[]) null);
rb.tag(info, (String) ret);
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
LOG.error("Error invoking method "+ method.getName(), ex);
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java Fri Aug 3 19:00:15 2012
@@ -181,6 +181,24 @@ public class MetricsRegistry {
}
/**
+ * Create a mutable metric that estimates quantiles of a stream of values
+ * @param name of the metric
+ * @param desc metric description
+ * @param sampleName of the metric (e.g., "Ops")
+ * @param valueName of the metric (e.g., "Time" or "Latency")
+ * @param interval rollover interval of estimator in seconds
+ * @return a new quantile estimator object
+ */
+ public synchronized MutableQuantiles newQuantiles(String name, String desc,
+ String sampleName, String valueName, int interval) {
+ checkMetricName(name);
+ MutableQuantiles ret =
+ new MutableQuantiles(name, desc, sampleName, valueName, interval);
+ metricsMap.put(name, ret);
+ return ret;
+ }
+
+ /**
* Create a mutable metric with stats
* @param name of the metric
* @param desc metric description
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java Fri Aug 3 19:00:15 2012
@@ -95,8 +95,7 @@ public class MetricsSourceBuilder {
r = (MetricsRegistry) field.get(source);
hasRegistry = r != null;
break;
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.warn("Error accessing field "+ field, e);
continue;
}
@@ -123,8 +122,7 @@ public class MetricsSourceBuilder {
// skip fields already set
field.setAccessible(true);
if (field.get(source) != null) continue;
- }
- catch (Exception e) {
+ } catch (Exception e) {
LOG.warn("Error accessing field "+ field +" annotated with"+
annotation, e);
continue;
@@ -135,8 +133,7 @@ public class MetricsSourceBuilder {
try {
field.set(source, mutable);
hasAtMetric = true;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new MetricsException("Error setting field "+ field +
" annotated with "+ annotation, e);
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGaugeLong.java Fri Aug 3 19:00:15 2012
@@ -80,6 +80,7 @@ public class MutableGaugeLong extends Mu
setChanged();
}
+ @Override
public void snapshot(MetricsRecordBuilder builder, boolean all) {
if (all || changed()) {
builder.addGauge(info(), value);
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableStat.java Fri Aug 3 19:00:15 2012
@@ -109,6 +109,7 @@ public class MutableStat extends Mutable
setChanged();
}
+ @Override
public synchronized void snapshot(MetricsRecordBuilder builder, boolean all) {
if (all || changed()) {
numSamples += intervalStat.numSamples();
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java Fri Aug 3 19:00:15 2012
@@ -48,8 +48,7 @@ public class FileSink implements Metrics
writer = filename == null
? new PrintWriter(System.out)
: new PrintWriter(new FileWriter(new File(filename), true));
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new MetricsException("Error creating "+ filename, e);
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java Fri Aug 3 19:00:15 2012
@@ -109,6 +109,7 @@ public abstract class AbstractGangliaSin
* org.apache.hadoop.metrics2.MetricsPlugin#init(org.apache.commons.configuration
* .SubsetConfiguration)
*/
+ @Override
public void init(SubsetConfiguration conf) {
LOG.debug("Initializing the GangliaSink for Ganglia metrics.");
@@ -155,6 +156,7 @@ public abstract class AbstractGangliaSin
*
* @see org.apache.hadoop.metrics2.MetricsSink#flush()
*/
+ @Override
public void flush() {
// nothing to do as we are not buffering data
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/GangliaSink31.java Fri Aug 3 19:00:15 2012
@@ -43,6 +43,7 @@ public class GangliaSink31 extends Gangl
* @param gSlope The slope for this metric
* @throws IOException
*/
+ @Override
protected void emitMetric(String groupName, String name, String type,
String value, GangliaConf gConf, GangliaSlope gSlope)
throws IOException {
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java Fri Aug 3 19:00:15 2012
@@ -34,6 +34,7 @@ import java.util.LinkedList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.util.Time;
/**
* This supports input and output streams for a socket channels.
@@ -194,7 +195,7 @@ abstract class SocketIOWithTimeout {
}
long timeoutLeft = timeout;
- long endTime = (timeout > 0) ? (System.currentTimeMillis() + timeout): 0;
+ long endTime = (timeout > 0) ? (Time.now() + timeout): 0;
while (true) {
// we might have to call finishConnect() more than once
@@ -209,7 +210,7 @@ abstract class SocketIOWithTimeout {
if (ret == 0 ||
(timeout > 0 &&
- (timeoutLeft = (endTime - System.currentTimeMillis())) <= 0)) {
+ (timeoutLeft = (endTime - Time.now())) <= 0)) {
throw new SocketTimeoutException(
timeoutExceptionString(channel, timeout,
SelectionKey.OP_CONNECT));
@@ -329,7 +330,7 @@ abstract class SocketIOWithTimeout {
try {
while (true) {
- long start = (timeout == 0) ? 0 : System.currentTimeMillis();
+ long start = (timeout == 0) ? 0 : Time.now();
key = channel.register(info.selector, ops);
ret = info.selector.select(timeout);
@@ -342,7 +343,7 @@ abstract class SocketIOWithTimeout {
* unknown reasons. So select again if required.
*/
if (timeout > 0) {
- timeout -= System.currentTimeMillis() - start;
+ timeout -= Time.now() - start;
if (timeout <= 0) {
return 0;
}
@@ -414,7 +415,7 @@ abstract class SocketIOWithTimeout {
selInfo = queue.removeLast();
}
- trimIdleSelectors(System.currentTimeMillis());
+ trimIdleSelectors(Time.now());
return selInfo;
}
@@ -425,7 +426,7 @@ abstract class SocketIOWithTimeout {
* @param info
*/
private synchronized void release(SelectorInfo info) {
- long now = System.currentTimeMillis();
+ long now = Time.now();
trimIdleSelectors(now);
info.lastActivityTime = now;
info.queue.addLast(info);
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java Fri Aug 3 19:00:15 2012
@@ -31,8 +31,8 @@ import java.nio.channels.WritableByteCha
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.metrics2.lib.MutableRate;
-import org.apache.hadoop.util.Progressable;
/**
* This implements an output stream that can have a timeout while writing.
@@ -179,9 +179,9 @@ public class SocketOutputStream extends
* @param fileCh FileChannel to transfer data from.
* @param position position within the channel where the transfer begins
* @param count number of bytes to transfer.
- * @param waitForWritableTime updated by the nanoseconds spent waiting for
- * the socket to become writable
- * @param transferTime updated by the nanoseconds spent transferring data
+ * @param waitForWritableTime nanoseconds spent waiting for the socket
+ * to become writable
+ * @param transferTime nanoseconds spent transferring data
*
* @throws EOFException
* If end of input file is reached before requested number of
@@ -195,8 +195,8 @@ public class SocketOutputStream extends
* {@link FileChannel#transferTo(long, long, WritableByteChannel)}.
*/
public void transferToFully(FileChannel fileCh, long position, int count,
- MutableRate waitForWritableTime,
- MutableRate transferToTime) throws IOException {
+ LongWritable waitForWritableTime,
+ LongWritable transferToTime) throws IOException {
long waitTime = 0;
long transferTime = 0;
while (count > 0) {
@@ -236,12 +236,12 @@ public class SocketOutputStream extends
waitTime += wait - start;
transferTime += transfer - wait;
}
-
+
if (waitForWritableTime != null) {
- waitForWritableTime.add(waitTime);
+ waitForWritableTime.set(waitTime);
}
if (transferToTime != null) {
- transferToTime.add(transferTime);
+ transferToTime.set(transferTime);
}
}
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java Fri Aug 3 19:00:15 2012
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* Initializes hadoop-auth AuthenticationFilter which provides support for
- * Kerberos HTTP SPENGO authentication.
+ * Kerberos HTTP SPNEGO authentication.
* <p/>
* It enables anonymous access, simple/speudo and Kerberos HTTP SPNEGO
* authentication for Hadoop JobTracker, NameNode, DataNodes and
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java?rev=1369164&r1=1369163&r2=1369164&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java Fri Aug 3 19:00:15 2012
@@ -27,6 +27,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Time;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -75,7 +76,7 @@ public class Groups {
public List<String> getGroups(String user) throws IOException {
// Return cached value if available
CachedGroups groups = userToGroupsMap.get(user);
- long now = System.currentTimeMillis();
+ long now = Time.now();
// if cache has a value and it hasn't expired
if (groups != null && (groups.getTimestamp() + cacheTimeout > now)) {
if(LOG.isDebugEnabled()) {
@@ -134,7 +135,7 @@ public class Groups {
*/
CachedGroups(List<String> groups) {
this.groups = groups;
- this.timestamp = System.currentTimeMillis();
+ this.timestamp = Time.now();
}
/**