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

YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556435 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-01-08 03:30:49 +00:00
parent 076ecf79ca
commit 49ec397340
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -203,6 +203,8 @@ Release 2.4.0 - UNRELEASED
YARN-1482. Modified WebApplicationProxy to make it work across ResourceManager YARN-1482. Modified WebApplicationProxy to make it work across ResourceManager
fail-over. (Xuan Gong via vinodkv) fail-over. (Xuan Gong via vinodkv)
YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/server/yarn_server_resourcemanager_service_protos.proto
View File

@ -138,6 +138,6 @@ message RMStateVersionProto {
///////////// RM Failover related records //////////////////////// ///////////// RM Failover related records ////////////////////////
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
message ActiveRMInfoProto { message ActiveRMInfoProto {
required string clusterid = 1; required string clusterId = 1;
required string rmId = 2; required string rmId = 2;
} }

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/EmbeddedElectorService.java
View File

@ -172,7 +172,7 @@ private static byte[] createActiveNodeInfo(String clusterId, String rmId)
throws IOException { throws IOException {
return YarnServerResourceManagerServiceProtos.ActiveRMInfoProto return YarnServerResourceManagerServiceProtos.ActiveRMInfoProto
.newBuilder() .newBuilder()
.setClusterid(clusterId) .setClusterId(clusterId)
.setRmId(rmId) .setRmId(rmId)
.build() .build()
.toByteArray(); .toByteArray();
@ -198,10 +198,10 @@ private synchronized boolean isParentZnodeSafe(String clusterId)
} }
// Check if the passed proto corresponds to an RM in the same cluster // Check if the passed proto corresponds to an RM in the same cluster
if (!proto.getClusterid().equals(clusterId)) { if (!proto.getClusterId().equals(clusterId)) {
LOG.error("Mismatched cluster! The other RM seems " + LOG.error("Mismatched cluster! The other RM seems " +
"to be from a different cluster. Current cluster = " + clusterId + "to be from a different cluster. Current cluster = " + clusterId +
"Other RM's cluster = " + proto.getClusterid()); "Other RM's cluster = " + proto.getClusterId());
return false; return false;
} }
return true; return true;