big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-5079. Cleaning up NNHAStatusHeartbeat.State from DatanodeProtocolProtos. Contributed by Tao Luo.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514118 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Shvachko 2013-08-15 01:29:16 +00:00
parent 9cf82b6a7b
commit 4c8db60092
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -6,6 +6,9 @@ Trunk (Unreleased)
HDFS-3034. Remove the deprecated DFSOutputStream.sync() method. (szetszwo) HDFS-3034. Remove the deprecated DFSOutputStream.sync() method. (szetszwo)
HDFS-5079. Cleaning up NNHAStatusHeartbeat.State from
DatanodeProtocolProtos. (Tao Luo via shv)
NEW FEATURES NEW FEATURES
HDFS-3125. Add JournalService to enable Journal Daemon. (suresh) HDFS-3125. Add JournalService to enable Journal Daemon. (suresh)

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
View File

@ -30,6 +30,7 @@
import org.apache.hadoop.fs.FsServerDefaults; import org.apache.hadoop.fs.FsServerDefaults;
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
import org.apache.hadoop.ha.proto.HAServiceProtocolProtos;
import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.ClientProtocol; import org.apache.hadoop.hdfs.protocol.ClientProtocol;
@ -1311,10 +1312,10 @@ public static NNHAStatusHeartbeatProto convert(NNHAStatusHeartbeat hb) {
NNHAStatusHeartbeatProto.newBuilder(); NNHAStatusHeartbeatProto.newBuilder();
switch (hb.getState()) { switch (hb.getState()) {
case ACTIVE: case ACTIVE:
builder.setState(NNHAStatusHeartbeatProto.State.ACTIVE); builder.setState(HAServiceProtocolProtos.HAServiceStateProto.ACTIVE);
break; break;
case STANDBY: case STANDBY:
builder.setState(NNHAStatusHeartbeatProto.State.STANDBY); builder.setState(HAServiceProtocolProtos.HAServiceStateProto.STANDBY);
break; break;
default: default:
throw new IllegalArgumentException("Unexpected NNHAStatusHeartbeat.State:" + throw new IllegalArgumentException("Unexpected NNHAStatusHeartbeat.State:" +

7
hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
View File

@ -31,6 +31,7 @@ option java_generic_services = true;
option java_generate_equals_and_hash = true; option java_generate_equals_and_hash = true;
package hadoop.hdfs; package hadoop.hdfs;
import "HAServiceProtocol.proto";
import "hdfs.proto"; import "hdfs.proto";
/** /**
@ -185,11 +186,7 @@ message StorageReportProto {
* txid - Highest transaction ID this NN has seen * txid - Highest transaction ID this NN has seen
*/ */
message NNHAStatusHeartbeatProto { message NNHAStatusHeartbeatProto {
enum State { required hadoop.common.HAServiceStateProto state = 1;
ACTIVE = 0;
STANDBY = 1;
}
required State state = 1;
required uint64 txid = 2; required uint64 txid = 2;
} }