Skip to content

Commit fc1fe56

Browse files
committed
YARN-11536. Fix CheckStyle.
1 parent 2bd6c39 commit fc1fe56

File tree

4 files changed

+82
-0
lines changed

4 files changed

+82
-0
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/FederationQueueWeight.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,19 @@ public static FederationQueueWeight newInstance(String routerWeight,
7575
return federationQueueWeight;
7676
}
7777

78+
@Private
79+
@Unstable
80+
public static FederationQueueWeight newInstance(String routerWeight,
81+
String amrmWeight, String headRoomAlpha, String queue, String policyManagerClassName) {
82+
FederationQueueWeight federationQueueWeight = Records.newRecord(FederationQueueWeight.class);
83+
federationQueueWeight.setRouterWeight(routerWeight);
84+
federationQueueWeight.setAmrmWeight(amrmWeight);
85+
federationQueueWeight.setHeadRoomAlpha(headRoomAlpha);
86+
federationQueueWeight.setQueue(queue);
87+
federationQueueWeight.setPolicyManagerClassName(policyManagerClassName);
88+
return federationQueueWeight;
89+
}
90+
7891
@Public
7992
@Unstable
8093
public abstract String getRouterWeight();
@@ -166,4 +179,20 @@ public static void checkHeadRoomAlphaValid(String headRoomAlpha) throws YarnExce
166179
protected static boolean isNumeric(String value) {
167180
return NumberUtils.isCreatable(value);
168181
}
182+
183+
@Public
184+
@Unstable
185+
public abstract String getQueue();
186+
187+
@Public
188+
@Unstable
189+
public abstract void setQueue(String queue);
190+
191+
@Public
192+
@Unstable
193+
public abstract String getPolicyManagerClassName();
194+
195+
@Public
196+
@Unstable
197+
public abstract void setPolicyManagerClassName(String policyManagerClassName);
169198
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@ message FederationQueueWeightProto {
444444
optional string routerWeight = 1;
445445
optional string amrmWeight = 2;
446446
optional string headRoomAlpha = 3;
447+
optional string queue = 4;
448+
optional string policyManagerClassName = 5;
447449
}
448450

449451
////////////////////////////////////////////////////////////////////////

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RouterCLI.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ public class RouterCLI extends Configured implements Tool {
109109

110110
private static final String OPTION_BATCH_SAVE = "batch-save";
111111

112+
private static final String OPTION_FORMAT = "format";
113+
112114
private static final String CMD_POLICY = "-policy";
113115
private static final String FORMAT_XML = "xml";
114116
private static final String FORMAT_JSON = "json";
@@ -312,7 +314,20 @@ private int handlePolicy(String[] args)
312314
"We will save the policy information of the queue, " +
313315
"including queue and weight information");
314316
saveOpt.setOptionalArg(true);
317+
Option batchSaveOpt = new Option(OPTION_BATCH_S, OPTION_BATCH_SAVE, false,
318+
"We will save queue policies in bulk, " +
319+
"where users can provide XML or JSON files containing the policies. " +
320+
"This command will parse the file contents and store the results " +
321+
"in the FederationStateStore.");
322+
Option formatOpt = new Option(null, "format", true,
323+
"Users can specify the file format using this option. " +
324+
"Currently, there are two supported file formats: XML and JSON. " +
325+
"These files contain the policy information for storing queue policies.");
326+
formatOpt.setOptionalArg(true);
327+
315328
opts.addOption(saveOpt);
329+
opts.addOption(batchSaveOpt);
330+
opts.addOption(formatOpt);
316331

317332
// Parse command line arguments.
318333
CommandLine cliParser;
@@ -325,6 +340,7 @@ private int handlePolicy(String[] args)
325340
}
326341

327342
// Try to parse the cmd save.
343+
// Save a single queue policy
328344
if (cliParser.hasOption(OPTION_S) || cliParser.hasOption(OPTION_SAVE)) {
329345
String policy = cliParser.getOptionValue(OPTION_S);
330346
if (StringUtils.isBlank(policy)) {
@@ -333,6 +349,21 @@ private int handlePolicy(String[] args)
333349
return handleSavePolicy(policy);
334350
}
335351

352+
// Save Queue Policies in Batches
353+
if (cliParser.hasOption(OPTION_BATCH_S) || cliParser.hasOption(OPTION_BATCH_SAVE)) {
354+
if (cliParser.hasOption(OPTION_FORMAT)) {
355+
String format = cliParser.getOptionValue(OPTION_FORMAT);
356+
if (StringUtils.isBlank(format) ||
357+
StringUtils.equalsAnyIgnoreCase(format, FORMAT_XML, FORMAT_JSON)) {
358+
System.out.println("We currently only support policy configuration files " +
359+
"in XML and JSON formats.");
360+
return EXIT_ERROR;
361+
}
362+
System.out.println("format:" + format);
363+
}
364+
System.out.println("We need to specify the format of the input file.");
365+
}
366+
336367
return EXIT_ERROR;
337368
}
338369

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/FederationQueueWeightPBImpl.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,26 @@ public void setHeadRoomAlpha(String headRoomAlpha) {
114114
builder.setHeadRoomAlpha(headRoomAlpha);
115115
}
116116

117+
@Override
118+
public String getQueue() {
119+
return null;
120+
}
121+
122+
@Override
123+
public void setQueue(String queue) {
124+
125+
}
126+
127+
@Override
128+
public String getPolicyManagerClassName() {
129+
return null;
130+
}
131+
132+
@Override
133+
public void setPolicyManagerClassName(String policyManagerClassName) {
134+
135+
}
136+
117137
@Override
118138
public int hashCode() {
119139
return getProto().hashCode();

0 commit comments

Comments
 (0)