Author: shv
Date: Fri Apr 30 22:31:48 2010
New Revision: 939853
URL: http://svn.apache.org/viewvc?rev=939853&view=rev
Log:
HDFS-1107. Merge -r 939850:939851 from trunk to branch-0.21.
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/src/java/hdfs-default.xml
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=939853&r1=939852&r2=939853&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Fri Apr 30 22:31:48 2010
@@ -333,6 +333,8 @@ Trunk (unreleased changes)
HDFS-1067. Create block recovery tests that handle errors. (hairong)
+ HDFS-1107. Turn on append by default. (shv)
+
BUG FIXES
HDFS-76. Better error message to users when commands fail because of
Modified: hadoop/hdfs/branches/branch-0.21/src/java/hdfs-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/hdfs-default.xml?rev=939853&r1=939852&r2=939853&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/java/hdfs-default.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/java/hdfs-default.xml Fri Apr 30
22:31:48 2010
@@ -401,15 +401,6 @@ creations/deletions), or "all".</descrip
</property>
<property>
- <name>dfs.support.append</name>
- <value>false</value>
- <description>Does HDFS allow appends to files?
- This is currently set to false because there are bugs in the
- "append code" and is not supported in any prodction cluster.
- </description>
-</property>
-
-<property>
<name>dfs.datanode.plugins</name>
<value></value>
<description>Comma-separated list of datanode plug-ins to be activated.
Modified:
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java?rev=939853&r1=939852&r2=939853&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
(original)
+++
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
Fri Apr 30 22:31:48 2010
@@ -148,7 +148,7 @@ public class DFSConfigKeys extends Commo
public static final String DFS_NAMENODE_HANDLER_COUNT_KEY =
"dfs.namenode.handler.count";
public static final int DFS_NAMENODE_HANDLER_COUNT_DEFAULT = 10;
public static final String DFS_SUPPORT_APPEND_KEY = "dfs.support.append";
- public static final boolean DFS_SUPPORT_APPEND_DEFAULT = false;
+ public static final boolean DFS_SUPPORT_APPEND_DEFAULT = true;
public static final String DFS_HTTPS_ENABLE_KEY = "dfs.https.enable";
public static final boolean DFS_HTTPS_ENABLE_DEFAULT = false;
public static final String DFS_DEFAULT_CHUNK_VIEW_SIZE_KEY =
"dfs.default.chunk.view.size";
Modified:
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java?rev=939853&r1=939852&r2=939853&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
(original)
+++
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
Fri Apr 30 22:31:48 2010
@@ -42,6 +42,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.DF;
import org.apache.hadoop.fs.DU;
import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.BlockListAsLongs;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
@@ -826,14 +827,15 @@ public class FSDataset implements FSCons
// Used for synchronizing access to usage stats
private Object statsLock = new Object();
- boolean supportAppends = false;
+ boolean supportAppends = true;
/**
* An FSDataset has a directory where it loads its data files.
*/
public FSDataset(DataStorage storage, Configuration conf) throws IOException
{
this.maxBlocksPerDir = conf.getInt("dfs.datanode.numblocks", 64);
- this.supportAppends = conf.getBoolean("dfs.support.append", false);
+ this.supportAppends = conf.getBoolean(DFSConfigKeys.DFS_SUPPORT_APPEND_KEY,
+
DFSConfigKeys.DFS_SUPPORT_APPEND_DEFAULT);
FSVolume[] volArray = new FSVolume[storage.getNumStorageDirs()];
for (int idx = 0; idx < storage.getNumStorageDirs(); idx++) {
volArray[idx] = new FSVolume(storage.getStorageDir(idx).getCurrentDir(),
conf);
Modified:
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=939853&r1=939852&r2=939853&view=diff
==============================================================================
---
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Fri Apr 30 22:31:48 2010
@@ -418,7 +418,8 @@ public class FSNamesystem implements FSC
this.blockInvalidateLimit = Math.max(this.blockInvalidateLimit,
20*(int)(heartbeatInterval/1000));
this.accessTimePrecision =
conf.getLong(DFSConfigKeys.DFS_NAMENODE_ACCESSTIME_PRECISION_KEY, 0);
- this.supportAppends = conf.getBoolean("dfs.support.append", false);
+ this.supportAppends = conf.getBoolean(DFSConfigKeys.DFS_SUPPORT_APPEND_KEY,
+
DFSConfigKeys.DFS_SUPPORT_APPEND_DEFAULT);
this.isAccessTokenEnabled = conf.getBoolean(
DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY,
DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_DEFAULT);
