Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-4866. Merging change r1493300 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493301 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-06-15 04:05:48 +00:00
parent fa7f3a018a
commit 2d8999dc35
7 changed files with 18 additions and 12 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

@ -38,6 +38,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-2802. Add HDFS Snapshot feature. (See breakdown of tasks below for
subtasks and contributors)
HDFS-4866. Protocol buffer support cannot compile under C. (Arpit Agarwal via
cnauroth)
NEW FEATURES
HDFS-1804. Add a new block-volume device choosing policy that looks at

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/NamenodeProtocolServerSideTranslatorPB.java
View File

@ -157,11 +157,13 @@ public class NamenodeProtocolServerSideTranslatorPB implements
}
@Override
public RegisterResponseProto register(RpcController unused,
RegisterRequestProto request) throws ServiceException {
public RegisterResponseProto registerSubordinateNamenode(
RpcController unused, RegisterRequestProto request)
throws ServiceException {
NamenodeRegistration reg;
try {
reg = impl.register(PBHelper.convert(request.getRegistration()));
reg = impl.registerSubordinateNamenode(
PBHelper.convert(request.getRegistration()));
} catch (IOException e) {
throw new ServiceException(e);
}

7
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/NamenodeProtocolTranslatorPB.java
View File

@ -167,12 +167,13 @@ public class NamenodeProtocolTranslatorPB implements NamenodeProtocol,
}
@Override
public NamenodeRegistration register(NamenodeRegistration registration)
throws IOException {
public NamenodeRegistration registerSubordinateNamenode(
NamenodeRegistration registration) throws IOException {
RegisterRequestProto req = RegisterRequestProto.newBuilder()
.setRegistration(PBHelper.convert(registration)).build();
try {
return PBHelper.convert(rpcProxy.register(NULL_CONTROLLER, req)
return PBHelper.convert(
rpcProxy.registerSubordinateNamenode(NULL_CONTROLLER, req)
.getRegistration());
} catch (ServiceException e) {
throw ProtobufHelper.getRemoteException(e);

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
View File

@ -361,7 +361,7 @@ public class BackupNode extends NameNode {
NamenodeRegistration nnReg = null;
while(!isStopRequested()) {
try {
nnReg = namenode.register(getRegistration());
nnReg = namenode.registerSubordinateNamenode(getRegistration());
break;
} catch(SocketTimeoutException e) { // name-node is busy
LOG.info("Problem connecting to name-node: " + nnRpcAddress);

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
View File

@ -374,8 +374,8 @@ class NameNodeRpcServer implements NamenodeProtocols {
}
@Override // NamenodeProtocol
public NamenodeRegistration register(NamenodeRegistration registration)
throws IOException {
public NamenodeRegistration registerSubordinateNamenode(
NamenodeRegistration registration) throws IOException {
namesystem.checkSuperuserPrivilege();
verifyLayoutVersion(registration.getVersion());
NamenodeRegistration myRegistration = nn.setRegistration();

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
View File

@ -134,8 +134,8 @@ public interface NamenodeProtocol {
* @return {@link NamenodeRegistration} of the node,
* which this node has just registered with.
*/
public NamenodeRegistration register(NamenodeRegistration registration)
throws IOException;
public NamenodeRegistration registerSubordinateNamenode(
NamenodeRegistration registration) throws IOException;
/**
* A request to the active name-node to start a checkpoint.

2
hadoop-hdfs-project/hadoop-hdfs/src/main/proto/NamenodeProtocol.proto
View File

@ -225,7 +225,7 @@ service NamenodeProtocolService {
/**
* Request to register a sub-ordinate namenode
*/
rpc register(RegisterRequestProto) returns(RegisterResponseProto);
rpc registerSubordinateNamenode(RegisterRequestProto) returns(RegisterResponseProto);
/**
* Request to start a checkpoint.