Sfoglia il codice sorgente

HDFS-10572. Fix TestOfflineEditsViewer#testGenerated. Contributed by Surendra Singh Lilhore.

(cherry picked from commit 2e835d986ecdc881eab3ab9650d854b6df482b20)
Akira Ajisaka 9 anni fa
parent
commit
5057390cad

+ 9 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.java

@@ -696,6 +696,7 @@ public class FSImageSerialization {
     final Long limit = info.getLimit();
     final FsPermission mode = info.getMode();
     final Long maxRelativeExpiry = info.getMaxRelativeExpiryMs();
+    final Short defaultReplication = info.getDefaultReplication();
 
     if (ownerName != null) {
       XMLUtils.addSaxString(contentHandler, "OWNERNAME", ownerName);
@@ -714,6 +715,10 @@ public class FSImageSerialization {
       XMLUtils.addSaxString(contentHandler, "MAXRELATIVEEXPIRY",
           Long.toString(maxRelativeExpiry));
     }
+    if (defaultReplication != null) {
+      XMLUtils.addSaxString(contentHandler, "DEFAULTREPLICATION",
+          Short.toString(defaultReplication));
+    }
   }
 
   public static CachePoolInfo readCachePoolInfo(Stanza st)
@@ -736,6 +741,10 @@ public class FSImageSerialization {
       info.setMaxRelativeExpiryMs(
           Long.parseLong(st.getValue("MAXRELATIVEEXPIRY")));
     }
+    if (st.hasChildren("DEFAULTREPLICATION")) {
+      info.setDefaultReplication(Short.parseShort(st
+          .getValue("DEFAULTREPLICATION")));
+    }
     return info;
   }