svn commit: r1570363 - in /hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs: CHANGES_HDFS-5535.txt src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java

[kihwal]

Author: kihwal
Date: Thu Feb 20 21:57:52 2014
New Revision: 1570363

URL: http://svn.apache.org/r1570363
Log:
HDFS-5985. SimulatedFSDataset#disableAndPurgeTrashStorage should not throw 
UnsupportedOperationException. Contributed by Jing Zhao.

Modified:
    
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
    
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java

Modified: 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt?rev=1570363&r1=1570362&r2=1570363&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
 (original)
+++ 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-5535.txt
 Thu Feb 20 21:57:52 2014
@@ -62,3 +62,6 @@ HDFS-5535 subtasks:
     HDFS-5980. Rollback does not need to load edits.  (jing9 via szetszwo)
 
     HDFS-5984. Fix TestEditLog and TestStandbyCheckpoints.  (jing9 via 
szetszwo)
+
+    HDFS-5985. SimulatedFSDataset#disableAndPurgeTrashStorage should not throw
+    UnsupportedOperationException. (jing9 via kihwal)

Modified: 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java?rev=1570363&r1=1570362&r2=1570363&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
 (original)
+++ 
hadoop/common/branches/HDFS-5535/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
 Thu Feb 20 21:57:52 2014
@@ -1061,7 +1061,7 @@ public class SimulatedFSDataset implemen
 
   @Override
   public void disableAndPurgeTrashStorage(String bpid) {
-    throw new UnsupportedOperationException();
+    // do nothing
   }
 
   @Override