hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [5/5] git commit: Merge branch 'trunk' into HDFS-6581
Date Tue, 09 Sep 2014 05:49:04 GMT
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/61ccd503
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/61ccd503
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/61ccd503

Branch: refs/heads/HDFS-6581
Commit: 61ccd503624457035759e8b605d93dacb6135fce
Parents: 4ff128a 90c8ece
Author: arp <arp@apache.org>
Authored: Mon Sep 8 22:44:04 2014 -0700
Committer: arp <arp@apache.org>
Committed: Mon Sep 8 22:44:04 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   5 +
 .../hdfs/server/datanode/BPOfferService.java    |   9 +-
 .../hdfs/server/datanode/BPServiceActor.java    |   2 +-
 .../server/datanode/BlockPoolSliceStorage.java  | 120 +++++++++--
 .../hdfs/server/datanode/DataStorage.java       |  31 ++-
 .../server/datanode/fsdataset/FsDatasetSpi.java |  11 +
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |  10 +
 .../server/namenode/EncryptionZoneManager.java  |  12 ++
 .../hdfs/server/namenode/FSDirectory.java       |   2 +-
 .../server/namenode/FSImageFormatPBINode.java   |  18 +-
 .../server/namenode/NameNodeLayoutVersion.java  |   6 +-
 .../hadoop-hdfs/src/main/proto/fsimage.proto    |   8 +-
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |  38 ++++
 .../apache/hadoop/hdfs/TestEncryptionZones.java |   8 +
 .../server/datanode/SimulatedFSDataset.java     |   8 +
 .../datanode/TestDataNodeRollingUpgrade.java    | 205 ++++++++++++++++---
 .../hdfs/server/namenode/FSXAttrBaseTest.java   |  75 ++++---
 .../hadoop-hdfs/src/test/resources/editsStored  | Bin 5252 -> 5252 bytes
 .../src/test/resources/editsStored.xml          |   2 +-
 19 files changed, 483 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
index 003aa0c,4383e56..c681f28
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
@@@ -81,14 -81,19 +81,20 @@@ public class DataStorage extends Storag
    final static String STORAGE_DIR_DETACHED = "detach";
    public final static String STORAGE_DIR_RBW = "rbw";
    public final static String STORAGE_DIR_FINALIZED = "finalized";
 +  public final static String STORAGE_DIR_LAZY_PERSIST = "lazypersist";
    public final static String STORAGE_DIR_TMP = "tmp";
  
-   // Set of bpids for which 'trash' is currently enabled.
-   // When trash is enabled block files are moved under a separate
-   // 'trash' folder instead of being deleted right away. This can
-   // be useful during rolling upgrades, for example.
-   // The set is backed by a concurrent HashMap.
+   /**
+    * Set of bpids for which 'trash' is currently enabled.
+    * When trash is enabled block files are moved under a separate
+    * 'trash' folder instead of being deleted right away. This can
+    * be useful during rolling upgrades, for example.
+    * The set is backed by a concurrent HashMap.
+    *
+    * Even if trash is enabled, it is not used if a layout upgrade
+    * is in progress for a storage directory i.e. if the previous
+    * directory exists.
+    */
    private Set<String> trashEnabledBpids;
  
    /**

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
index 9d7ee9d,404e205..6913c29
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
@@@ -67,11 -67,9 +67,11 @@@ public class NameNodeLayoutVersion 
      EDITLOG_LENGTH(-56, "Add length field to every edit log op"),
      XATTRS(-57, "Extended attributes"),
      CREATE_OVERWRITE(-58, "Use single editlog record for " +
 -      "creating file with overwrite"),
 -    XATTRS_NAMESPACE_EXT(-59, "Increase number of xattr namespaces");
 -    
 +        "creating file with overwrite"),
-     LAZY_PERSIST_FILES(-59, "Support for optional lazy persistence of "
-         + " files with reduced durability guarantees");
++    XATTRS_NAMESPACE_EXT(-59, "Increase number of xattr namespaces"),
++    LAZY_PERSIST_FILES(-60, "Support for optional lazy persistence of " + 
++        " files with reduced durability guarantees");
 +
-     
      private final FeatureInfo info;
  
      /**

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/61ccd503/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
index 2451432,8ad4510..56e1ba9
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
@@@ -1079,8 -1073,16 +1079,16 @@@ public class SimulatedFSDataset impleme
    }
  
    @Override
+   public void setRollingUpgradeMarker(String bpid) {
+   }
+ 
+   @Override
+   public void clearRollingUpgradeMarker(String bpid) {
+   }
+ 
+   @Override
    public void checkAndUpdate(String bpid, long blockId, File diskFile,
 -      File diskMetaFile, FsVolumeSpi vol) {
 +      File diskMetaFile, FsVolumeSpi vol) throws IOException {
      throw new UnsupportedOperationException();
    }
  


Mime
View raw message