You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by jg...@apache.org on 2010/06/03 23:42:21 UTC
svn commit: r951178 - in /hadoop/hdfs/trunk: ./
src/java/org/apache/hadoop/hdfs/
src/java/org/apache/hadoop/hdfs/server/datanode/
src/java/org/apache/hadoop/hdfs/server/datanode/metrics/
src/java/org/apache/hadoop/hdfs/server/namenode/
Author: jghoman
Date: Thu Jun 3 21:42:21 2010
New Revision: 951178
URL: http://svn.apache.org/viewvc?rev=951178&view=rev
Log:
HDFS-1184. Replace tabs in code with spaces. Contributed by Jeff.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSClient.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Jun 3 21:42:21 2010
@@ -34,6 +34,8 @@ Trunk (unreleased changes)
HDFS-1119. Introduce a GSet interface to BlocksMap. (szetszwo)
+ HDFS-1184. Replace tabs in code with spaces. (Jeff via jghoman)
+
BUG FIXES
HDFS-1039. Adding test for JspHelper.getUGI(jnp via boryas)
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSClient.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSClient.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSClient.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSClient.java Thu Jun 3 21:42:21 2010
@@ -243,7 +243,7 @@ public class DFSClient implements FSCons
this.socketFactory = NetUtils.getSocketFactory(conf, ClientProtocol.class);
// dfs.write.packet.size is an internal config variable
this.writePacketSize = conf.getInt(DFSConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_KEY,
- DFSConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT);
+ DFSConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT);
// The hdfsTimeout is currently the same as the ipc timeout
this.hdfsTimeout = Client.getTimeout(conf);
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java Thu Jun 3 21:42:21 2010
@@ -667,7 +667,7 @@ class DataBlockScanner implements Runnab
((info.lastScanType == ScanType.VERIFICATION_SCAN) ? "local" :
"none");
buffer.append(String.format("%-26s : status : %-6s type : %-6s" +
- " scan time : " +
+ " scan time : " +
"%-15d %s\n", info.block,
(info.lastScanOk ? "ok" : "failed"),
scanType, scanTime,
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java Thu Jun 3 21:42:21 2010
@@ -67,7 +67,7 @@ public class DataNodeActivityMBean exten
name = datanodeName.replace(":", "-");
}
mbeanName = MBeanUtil.registerMBean("DataNode",
- "DataNodeActivity-" + name, this);
+ "DataNodeActivity-" + name, this);
}
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java Thu Jun 3 21:42:21 2010
@@ -56,7 +56,7 @@ class Checkpointer extends Daemon {
private BackupNode backupNode;
volatile boolean shouldRun;
- private long checkpointPeriod; // in seconds
+ private long checkpointPeriod; // in seconds
private long checkpointSize; // size (in MB) of current Edit Log
private BackupStorage getFSImage() {
@@ -255,6 +255,6 @@ class Checkpointer extends Daemon {
getFSImage().getEditLog().close();
LOG.info("Checkpoint completed in "
+ (FSNamesystem.now() - startTime)/1000 + " seconds."
- + " New Image Size: " + bnImage.getFsImageName().length());
+ + " New Image Size: " + bnImage.getFsImageName().length());
}
}
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java Thu Jun 3 21:42:21 2010
@@ -920,7 +920,7 @@ class FSDirectory implements Closeable {
/** Return if a directory is empty or not **/
boolean isDirEmpty(String src) throws UnresolvedLinkException {
- boolean dirNotEmpty = true;
+ boolean dirNotEmpty = true;
if (!isDir(src)) {
return true;
}
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Thu Jun 3 21:42:21 2010
@@ -96,7 +96,7 @@ public class FSEditLog {
NamenodeProtocol.JA_CHECKPOINT_TIME;
static final String NO_JOURNAL_STREAMS_WARNING = "!!! WARNING !!!" +
- " File system changes are not persistent. No journal streams.";
+ " File system changes are not persistent. No journal streams.";
private volatile int sizeOutputFlushBuffer = 512*1024;
@@ -349,13 +349,13 @@ public class FSEditLog {
* @return the matching stream
*/
synchronized EditLogOutputStream getEditsStream(StorageDirectory sd) {
- for (EditLogOutputStream es : editStreams) {
- File parentStorageDir = ((EditLogFileOutputStream)es).getFile()
- .getParentFile().getParentFile();
- if (parentStorageDir.getName().equals(sd.getRoot().getName()))
- return es;
- }
- return null;
+ for (EditLogOutputStream es : editStreams) {
+ File parentStorageDir = ((EditLogFileOutputStream)es).getFile()
+ .getParentFile().getParentFile();
+ if (parentStorageDir.getName().equals(sd.getRoot().getName()))
+ return es;
+ }
+ return null;
}
/**
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java Thu Jun 3 21:42:21 2010
@@ -127,7 +127,7 @@ class INodeFileUnderConstruction extends
throws IOException {
if (blocks == null || blocks.length == 0) {
throw new IOException("Trying to update non-existant block. " +
- "File is empty.");
+ "File is empty.");
}
BlockInfoUnderConstruction ucBlock =
lastBlock.convertToBlockUnderConstruction(
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Thu Jun 3 21:42:21 2010
@@ -302,7 +302,7 @@ public class NameNode implements Namenod
this.server = RPC.getServer(NamenodeProtocols.class, this,
socAddr.getHostName(), socAddr.getPort(),
handlerCount, false, conf,
- namesystem.getDelegationTokenSecretManager());
+ namesystem.getDelegationTokenSecretManager());
// The rpc-server port can be ephemeral... ensure we have the correct info
this.rpcAddress = this.server.getListenerAddress();
setRpcServerAddress(conf);
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/PendingReplicationBlocks.java Thu Jun 3 21:42:21 2010
@@ -84,7 +84,7 @@ class PendingReplicationBlocks {
synchronized (pendingReplications) {
PendingBlockInfo found = pendingReplications.get(block);
if (found != null) {
- FSNamesystem.LOG.debug("Removing pending replication for block" + block);
+ FSNamesystem.LOG.debug("Removing pending replication for block" + block);
found.decrementReplicas();
if (found.getNumReplicas() <= 0) {
pendingReplications.remove(block);
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=951178&r1=951177&r2=951178&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java Thu Jun 3 21:42:21 2010
@@ -85,7 +85,7 @@ public class SecondaryNameNode implement
private Collection<URI> checkpointDirs;
private Collection<URI> checkpointEditsDirs;
- private long checkpointPeriod; // in seconds
+ private long checkpointPeriod; // in seconds
private long checkpointSize; // size (in MB) of current Edit Log
/** {@inheritDoc} */