Skip to content

YARN-10862. Add new proto changes required for NodeHealthDetails in NodeHealthStatus #3216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cyrus-jackson wants to merge 3 commits into from
Closed

YARN-10862. Add new proto changes required for NodeHealthDetails in NodeHealthStatus #3216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2580911
Adds new proto NodeHealthDeatils in NodeHealthStatus
Jul 19, 2021
8b22793
Correct Checkstyle
Jul 20, 2021
36da402
Changes proto from node_resource_values to node_health_details
Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,11 @@ message StringLocalResourceMapProto {
optional LocalResourceProto value = 2;
}

message IntLongMapProto {
required int32 key = 1;
required int64 value = 2;
}

message StringStringMapProto {
optional string key = 1;
optional string value = 2;
Expand Down
28 changes: 28 additions & 0 deletions ...doop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import org.apache.hadoop.yarn.proto.YarnProtos.ContainerStateProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ContainerSubStateProto;
import org.apache.hadoop.yarn.proto.YarnProtos.FinalApplicationStatusProto;
import org.apache.hadoop.yarn.proto.YarnProtos.IntLongMapProto;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceTypeProto;
import org.apache.hadoop.yarn.proto.YarnProtos.LocalResourceVisibilityProto;
import org.apache.hadoop.yarn.proto.YarnProtos.LogAggregationStatusProto;
Expand Down Expand Up @@ -629,6 +630,33 @@ public static Map<String, Float> convertStringFloatMapProtoListToMap(
return ret;
}

public static List<YarnProtos.IntLongMapProto>
convertIntLongMapToProtoList(Map<Integer, Long> integerLongMap) {
List<YarnProtos.IntLongMapProto> pList = new ArrayList<>();
if (integerLongMap != null && !integerLongMap.isEmpty()) {
IntLongMapProto.Builder pBuilder = IntLongMapProto.newBuilder();
for (Map.Entry<Integer, Long> entry : integerLongMap.entrySet()) {
pBuilder.setKey(entry.getKey());
pBuilder.setValue(entry.getValue());
pList.add(pBuilder.build());
}
}
return pList;
}

public static Map<Integer, Long> convertProtoListToIntLongMap(
List<IntLongMapProto> pList) {
Map<Integer, Long> ret = new HashMap<>();
if (pList != null) {
for (IntLongMapProto p : pList) {
if (p.hasKey()) {
ret.put(p.getKey(), p.getValue());
}
}
}
return ret;
}

public static List<YarnProtos.StringStringMapProto> convertToProtoFormat(
Map<String, String> stringMap) {
List<YarnProtos.StringStringMapProto> pList = new ArrayList<>();
Expand Down
6 changes: 6 additions & 0 deletions ...doop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_protos.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,16 @@ message MasterKeyProto {
optional bytes bytes = 2;
}

message NodeHealthDetailsProto {
optional int32 overall_value = 1;
repeated IntLongMapProto node_health_details = 2;
}

message NodeHealthStatusProto {
optional bool is_node_healthy = 1;
optional string health_report = 2;
optional int64 last_health_report_time = 3;
optional NodeHealthDetailsProto node_health_details = 4;
}

message VersionProto {
Expand Down