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 at...@apache.org on 2012/04/05 19:22:20 UTC
svn commit: r1309957 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java
Author: atm
Date: Thu Apr 5 17:22:20 2012
New Revision: 1309957
URL: http://svn.apache.org/viewvc?rev=1309957&view=rev
Log:
HDFS-3202. NamespaceInfo PB translation drops build version. Contributed by Aaron T. Myers.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1309957&r1=1309956&r2=1309957&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Apr 5 17:22:20 2012
@@ -317,6 +317,8 @@ Release 2.0.0 - UNRELEASED
HDFS-3199. TestValidateConfigurationSettings is failing. (todd via eli)
+ HDFS-3202. NamespaceInfo PB translation drops build version. (atm)
+
BREAKDOWN OF HDFS-1623 SUBTASKS
HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java?rev=1309957&r1=1309956&r2=1309957&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java Thu Apr 5 17:22:20 2012
@@ -384,7 +384,8 @@ public class PBHelper {
public static NamespaceInfo convert(NamespaceInfoProto info) {
StorageInfoProto storage = info.getStorageInfo();
return new NamespaceInfo(storage.getNamespceID(), storage.getClusterID(),
- info.getBlockPoolID(), storage.getCTime(), info.getDistUpgradeVersion());
+ info.getBlockPoolID(), storage.getCTime(), info.getDistUpgradeVersion(),
+ info.getBuildVersion());
}
public static NamenodeCommand convert(NamenodeCommandProto cmd) {
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java?rev=1309957&r1=1309956&r2=1309957&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java Thu Apr 5 17:22:20 2012
@@ -50,14 +50,19 @@ public class NamespaceInfo extends Stora
super();
buildVersion = null;
}
-
- public NamespaceInfo(int nsID, String clusterID, String bpID,
- long cT, int duVersion) {
+
+ public NamespaceInfo(int nsID, String clusterID, String bpID,
+ long cT, int duVersion, String buildVersion) {
super(HdfsConstants.LAYOUT_VERSION, nsID, clusterID, cT);
blockPoolID = bpID;
- buildVersion = Storage.getBuildVersion();
+ this.buildVersion = buildVersion;
this.distributedUpgradeVersion = duVersion;
}
+
+ public NamespaceInfo(int nsID, String clusterID, String bpID,
+ long cT, int duVersion) {
+ this(nsID, clusterID, bpID, cT, duVersion, Storage.getBuildVersion());
+ }
public String getBuildVersion() {
return buildVersion;