Repository: hadoop Updated Branches: refs/heads/YARN-5734 e8b0e3b9c -> 9cac5d353
YARN-7251. Misc changes to YARN-5734 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9cac5d35 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cac5d35 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cac5d35 Branch: refs/heads/YARN-5734 Commit: 9cac5d35393e491525a82379ffc423a57fb428b2 Parents: e8b0e3b Author: Jonathan Hung <jh...@linkedin.com> Authored: Mon Sep 25 17:52:40 2017 -0700 Committer: Jonathan Hung <jh...@linkedin.com> Committed: Mon Sep 25 17:52:40 2017 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/hadoop-yarn/bin/yarn | 3 +- hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 3 +- .../hadoop/yarn/conf/YarnConfiguration.java | 28 +++++++++++++ .../hadoop/yarn/client/cli/SchedConfCLI.java | 42 ++++++++++++++------ .../yarn/client/cli/TestSchedConfCLI.java | 20 +++++----- .../src/main/resources/yarn-default.xml | 4 +- .../resourcemanager/webapp/RMWebServices.java | 2 +- .../TestRMWebServicesConfigurationMutation.java | 24 +++++------ .../src/site/markdown/CapacityScheduler.md | 2 +- .../src/site/markdown/ResourceManagerRest.md | 10 ++--- .../src/site/markdown/YarnCommands.md | 10 ++--- 11 files changed, 97 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index 331fcfe..a9b152d 100755 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -47,6 +47,7 @@ function hadoop_usage hadoop_add_subcommand "resourcemanager" daemon "run the ResourceManager" hadoop_add_subcommand "rmadmin" admin "admin tools" hadoop_add_subcommand "router" daemon "run the Router daemon" + hadoop_add_subcommand "schedulerconf" client "Updates scheduler configuration" hadoop_add_subcommand "scmadmin" admin "SharedCacheManager admin tools" hadoop_add_subcommand "sharedcachemanager" admin "run the SharedCacheManager daemon" hadoop_add_subcommand "timelinereader" client "run the timeline reader server" @@ -142,7 +143,7 @@ function yarncmd_case HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME='org.apache.hadoop.yarn.server.router.Router' ;; - schedconf) + schedulerconf) HADOOP_CLASSNAME='org.apache.hadoop.yarn.client.cli.SchedConfCLI' ;; scmadmin) http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd index 7ec9848..fed3d90 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd @@ -295,7 +295,7 @@ goto :eof set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% goto :eof -:schedconf +:schedulerconf set CLASS=org.apache.hadoop.yarn.client.cli.SchedConfCLI set YARN_OPTS=%YARN_OPTS% %YARN_CLIENT_OPTS% goto :eof @@ -345,6 +345,7 @@ goto :eof @echo node prints node report(s) @echo queue prints queue information @echo logs dump container logs + @echo schedulerconf updates scheduler configuration @echo classpath prints the class path needed to get the @echo Hadoop jar and the required libraries @echo daemonlog get/set the log level for each daemon http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index e3ce3ecc..5af44ac 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -674,33 +674,61 @@ public class YarnConfiguration extends Configuration { public static final String DEFAULT_RM_CONFIGURATION_PROVIDER_CLASS = "org.apache.hadoop.yarn.LocalConfigurationProvider"; + @Private + @Unstable public static final String SCHEDULER_CONFIGURATION_STORE_CLASS = YARN_PREFIX + "scheduler.configuration.store.class"; + @Private + @Unstable public static final String MEMORY_CONFIGURATION_STORE = "memory"; + @Private + @Unstable public static final String LEVELDB_CONFIGURATION_STORE = "leveldb"; + @Private + @Unstable public static final String ZK_CONFIGURATION_STORE = "zk"; + @Private + @Unstable public static final String DEFAULT_CONFIGURATION_STORE = MEMORY_CONFIGURATION_STORE; + @Private + @Unstable public static final String RM_SCHEDCONF_STORE_PATH = YARN_PREFIX + "scheduler.configuration.leveldb-store.path"; + @Private + @Unstable public static final String RM_SCHEDCONF_LEVELDB_COMPACTION_INTERVAL_SECS = YARN_PREFIX + "scheduler.configuration.leveldb-store.compaction-interval-secs"; + @Private + @Unstable public static final long DEFAULT_RM_SCHEDCONF_LEVELDB_COMPACTION_INTERVAL_SECS = 60 * 60 * 24L; + @Private + @Unstable public static final String RM_SCHEDCONF_MAX_LOGS = YARN_PREFIX + "scheduler.configuration.store.max-logs"; + @Private + @Unstable public static final long DEFAULT_RM_SCHEDCONF_LEVELDB_MAX_LOGS = 1000; + @Private + @Unstable public static final long DEFAULT_RM_SCHEDCONF_ZK_MAX_LOGS = 1000; /** Parent znode path under which ZKConfigurationStore will create znodes. */ + @Private + @Unstable public static final String RM_SCHEDCONF_STORE_ZK_PARENT_PATH = YARN_PREFIX + "scheduler.configuration.zk-store.parent-path"; + @Private + @Unstable public static final String DEFAULT_RM_SCHEDCONF_STORE_ZK_PARENT_PATH = "/confstore"; + @Private + @Unstable public static final String RM_SCHEDULER_MUTATION_ACL_POLICY_CLASS = YARN_PREFIX + "scheduler.configuration.mutation.acl-policy.class"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java index e17062e..11bfdd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/SchedConfCLI.java @@ -27,7 +27,7 @@ import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.MissingArgumentException; import org.apache.commons.cli.Options; import org.apache.hadoop.classification.InterfaceAudience.Public; -import org.apache.hadoop.classification.InterfaceStability.Evolving; +import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.util.Tool; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -48,7 +48,7 @@ import java.util.Map; * CLI for modifying scheduler configuration. */ @Public -@Evolving +@Unstable public class SchedConfCLI extends Configured implements Tool { private static final String ADD_QUEUES_OPTION = "addQueues"; @@ -135,7 +135,7 @@ public class SchedConfCLI extends Configured implements Tool { WebResource webResource = webServiceClient.resource(WebAppUtils. getRMWebAppURLWithScheme(getConf())); ClientResponse response = webResource.path("ws").path("v1").path("cluster") - .path("sched-conf").accept(MediaType.APPLICATION_JSON) + .path("scheduler-conf").accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) .put(ClientResponse.class); @@ -170,7 +170,7 @@ public class SchedConfCLI extends Configured implements Tool { if (args == null) { return; } - List<String> queuesToRemove = Arrays.asList(args.split(",")); + List<String> queuesToRemove = Arrays.asList(args.split(";")); updateInfo.setRemoveQueueInfo(new ArrayList<>(queuesToRemove)); } @@ -199,11 +199,14 @@ public class SchedConfCLI extends Configured implements Tool { } private QueueConfigInfo getQueueConfigInfo(String arg) { - String[] queueArgs = arg.split(","); - String queuePath = queueArgs[0]; + String[] args = arg.split(":"); + String queuePath = args[0]; Map<String, String> queueConfigs = new HashMap<>(); - for (int i = 1; i < queueArgs.length; ++i) { - putKeyValuePair(queueConfigs, queueArgs[i]); + if (args.length > 1) { + String[] queueArgs = args[1].split(","); + for (int i = 0; i < queueArgs.length; ++i) { + putKeyValuePair(queueConfigs, queueArgs[i]); + } } return new QueueConfigInfo(queuePath, queueConfigs); } @@ -228,11 +231,24 @@ public class SchedConfCLI extends Configured implements Tool { } private void printUsage() { - System.out.println("yarn schedconf [-add queueAddPath1,confKey1=confVal1," - + "confKey2=confVal2;queueAddPath2,confKey3=confVal3] " - + "[-remove queueRemovePath1,queueRemovePath2] " - + "[-update queueUpdatePath1,confKey1=confVal1] " + System.out.println("yarn schedulerconf [-add " + + "\"queueAddPath1:confKey1=confVal1,confKey2=confVal2;" + + "queueAddPath2:confKey3=confVal3\"] " + + "[-remove \"queueRemovePath1;queueRemovePath2\"] " + + "[-update \"queueUpdatePath1:confKey1=confVal1\"] " + "[-global globalConfKey1=globalConfVal1," - + "globalConfKey2=globalConfVal2]"); + + "globalConfKey2=globalConfVal2]\n" + + "Example (adding queues): yarn schedulerconf -add " + + "\"root.a.a1:capacity=100,maximum-capacity=100;root.a.a2:capacity=0," + + "maximum-capacity=0\"\n" + + "Example (removing queues): yarn schedulerconf -remove \"root.a.a1;" + + "root.a.a2\"\n" + + "Example (updating queues): yarn schedulerconf -update \"root.a.a1" + + ":capacity=25,maximum-capacity=25;root.a.a2:capacity=75," + + "maximum-capacity=75\"\n" + + "Example (global scheduler update): yarn schedulerconf " + + "-global yarn.scheduler.capacity.maximum-applications=10000\n" + + "Note: This is an alpha feature, the syntax/options are subject to " + + "change, please run at your own risk."); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestSchedConfCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestSchedConfCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestSchedConfCLI.java index d2f0639..5364e83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestSchedConfCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestSchedConfCLI.java @@ -61,20 +61,20 @@ public class TestSchedConfCLI { @Test(timeout = 10000) public void testInvalidConf() throws Exception { // conf pair with no key should be invalid - int exitCode = cli.run(new String[] {"-add", "root.a,=confVal"}); + int exitCode = cli.run(new String[] {"-add", "root.a:=confVal"}); assertTrue("Should return an error code", exitCode != 0); assertTrue(sysErrStream.toString().contains("Specify configuration key " + "value as confKey=confVal.")); - exitCode = cli.run(new String[] {"-update", "root.a,=confVal"}); + exitCode = cli.run(new String[] {"-update", "root.a:=confVal"}); assertTrue("Should return an error code", exitCode != 0); assertTrue(sysErrStream.toString().contains("Specify configuration key " + "value as confKey=confVal.")); - exitCode = cli.run(new String[] {"-add", "root.a,confKey=confVal=conf"}); + exitCode = cli.run(new String[] {"-add", "root.a:confKey=confVal=conf"}); assertTrue("Should return an error code", exitCode != 0); assertTrue(sysErrStream.toString().contains("Specify configuration key " + "value as confKey=confVal.")); - exitCode = cli.run(new String[] {"-update", "root.a,confKey=confVal=c"}); + exitCode = cli.run(new String[] {"-update", "root.a:confKey=confVal=c"}); assertTrue("Should return an error code", exitCode != 0); assertTrue(sysErrStream.toString().contains("Specify configuration key " + "value as confKey=confVal.")); @@ -83,8 +83,7 @@ public class TestSchedConfCLI { @Test(timeout = 10000) public void testAddQueues() { SchedConfUpdateInfo schedUpdateInfo = new SchedConfUpdateInfo(); - cli.addQueues("root.a,a1=aVal1,a2=aVal2," + - "a3=", schedUpdateInfo); + cli.addQueues("root.a:a1=aVal1,a2=aVal2,a3=", schedUpdateInfo); QueueConfigInfo addInfo = schedUpdateInfo.getAddQueueInfo().get(0); assertEquals("root.a", addInfo.getQueue()); Map<String, String> params = addInfo.getParams(); @@ -94,7 +93,7 @@ public class TestSchedConfCLI { assertNull(params.get("a3")); schedUpdateInfo = new SchedConfUpdateInfo(); - cli.addQueues("root.b,b1=bVal1;root.c,c1=cVal1", schedUpdateInfo); + cli.addQueues("root.b:b1=bVal1;root.c:c1=cVal1", schedUpdateInfo); assertEquals(2, schedUpdateInfo.getAddQueueInfo().size()); QueueConfigInfo bAddInfo = schedUpdateInfo.getAddQueueInfo().get(0); assertEquals("root.b", bAddInfo.getQueue()); @@ -111,7 +110,7 @@ public class TestSchedConfCLI { @Test(timeout = 10000) public void testRemoveQueues() { SchedConfUpdateInfo schedUpdateInfo = new SchedConfUpdateInfo(); - cli.removeQueues("root.a,root.b,root.c.c1", schedUpdateInfo); + cli.removeQueues("root.a;root.b;root.c.c1", schedUpdateInfo); List<String> removeInfo = schedUpdateInfo.getRemoveQueueInfo(); assertEquals(3, removeInfo.size()); assertEquals("root.a", removeInfo.get(0)); @@ -122,8 +121,7 @@ public class TestSchedConfCLI { @Test(timeout = 10000) public void testUpdateQueues() { SchedConfUpdateInfo schedUpdateInfo = new SchedConfUpdateInfo(); - cli.updateQueues("root.a,a1=aVal1,a2=aVal2," + - "a3=", schedUpdateInfo); + cli.updateQueues("root.a:a1=aVal1,a2=aVal2,a3=", schedUpdateInfo); QueueConfigInfo updateInfo = schedUpdateInfo.getUpdateQueueInfo().get(0); assertEquals("root.a", updateInfo.getQueue()); Map<String, String> params = updateInfo.getParams(); @@ -133,7 +131,7 @@ public class TestSchedConfCLI { assertNull(params.get("a3")); schedUpdateInfo = new SchedConfUpdateInfo(); - cli.updateQueues("root.b,b1=bVal1;root.c,c1=cVal1", schedUpdateInfo); + cli.updateQueues("root.b:b1=bVal1;root.c:c1=cVal1", schedUpdateInfo); assertEquals(2, schedUpdateInfo.getUpdateQueueInfo().size()); QueueConfigInfo bUpdateInfo = schedUpdateInfo.getUpdateQueueInfo().get(0); assertEquals("root.b", bUpdateInfo.getQueue()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index a6521de..617c034 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -3373,7 +3373,9 @@ configurations, if using a mutable configuration provider. Keywords such as "memory" map to certain configuration store implementations. If keyword is not found, try to load this - value as a class. + value as a class. Note: this configuration is only useful when using a + scheduler which supports mutable configuration. Currently only capacity + scheduler supports this. </description> <name>yarn.scheduler.configuration.store.class</name> <value>memory</value> http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java index d264c10..e6a0cae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java @@ -2461,7 +2461,7 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol { } @PUT - @Path("/sched-conf") + @Path("/scheduler-conf") @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8, MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index 26ef1b7..808d781 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -179,7 +179,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getAddQueueInfo().add(d); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -214,7 +214,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getUpdateQueueInfo().add(b); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -240,7 +240,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getRemoveQueueInfo().add("root.a.a2"); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -265,7 +265,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getRemoveQueueInfo().add("root.c"); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -296,7 +296,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getUpdateQueueInfo().add(b); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -328,7 +328,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getUpdateQueueInfo().add(configInfo); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -356,7 +356,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { } response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -391,7 +391,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { 0.001f); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -409,7 +409,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { updateInfo.getUpdateQueueInfo().add(aUpdateInfo); response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -439,7 +439,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -464,7 +464,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) @@ -479,7 +479,7 @@ public class TestRMWebServicesConfigurationMutation extends JerseyTestBase { // Unset maximum-applications. Should be set to default. response = r.path("ws").path("v1").path("cluster") - .path("sched-conf").queryParam("user.name", userName) + .path("scheduler-conf").queryParam("user.name", userName) .accept(MediaType.APPLICATION_JSON) .entity(YarnWebServiceUtils.toJson(updateInfo, SchedConfUpdateInfo.class), MediaType.APPLICATION_JSON) http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md index d70f891..45fa2ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md @@ -320,4 +320,4 @@ Changing queue/scheduler properties and adding/removing queues can be done in tw **Note:** When enabling backing store for scheduler configuration, *yarn rmadmin -refreshQueues* will be disabled, i.e. it will no longer be possible to update configuration via file. - See the [YARN Resource Manager REST API](ResourceManagerRest.html#Scheduler_Configuration_Mutation_API) for examples on how to change scheduler configuration via REST, and [YARN Commands Reference](YarnCommands.html#schedconf) for examples on how to change scheduler configuration via command line. + See the [YARN Resource Manager REST API](ResourceManagerRest.html#Scheduler_Configuration_Mutation_API) for examples on how to change scheduler configuration via REST, and [YARN Commands Reference](YarnCommands.html#schedulerconf) for examples on how to change scheduler configuration via command line. http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md index 025e9a7..271555e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRest.md @@ -4439,7 +4439,7 @@ The scheduler configuration mutation API provides a way to modify scheduler/queu ### URI - * http://rm-http-address:port/ws/v1/cluster/sched-conf + * http://rm-http-address:port/ws/v1/cluster/scheduler-conf ### HTTP Operations Supported @@ -4475,7 +4475,7 @@ HTTP Request: ```xml Accept: application/xml - PUT http://rm-http-address:port/ws/v1/cluster/sched-conf + PUT http://rm-http-address:port/ws/v1/cluster/scheduler-conf Content-Type: application/xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <schedConf> @@ -4520,7 +4520,7 @@ HTTP Request: ```xml Accept: application/xml - PUT http://rm-http-address:port/ws/v1/cluster/sched-conf + PUT http://rm-http-address:port/ws/v1/cluster/scheduler-conf Content-Type: application/xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <schedConf> @@ -4573,7 +4573,7 @@ HTTP Request: ```xml Accept: application/xml - PUT http://rm-http-address:port/ws/v1/cluster/sched-conf + PUT http://rm-http-address:port/ws/v1/cluster/scheduler-conf Content-Type: application/xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <schedConf> @@ -4597,7 +4597,7 @@ HTTP Request: ```xml Accept: application/xml - PUT http://rm-http-address:port/ws/v1/cluster/sched-conf + PUT http://rm-http-address:port/ws/v1/cluster/scheduler-conf Content-Type: application/xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <schedConf> http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cac5d35/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md index 2fc65bc..8589885 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md @@ -237,15 +237,15 @@ Usage: Runs ResourceManager admin client -### schedconf +### schedulerconf -Usage: `yarn schedconf [options]` +Usage: `yarn schedulerconf [options]` | COMMAND\_OPTIONS | Description | |:---- |:---- | -| -add <queuePath1,key1=val1,key2=val2;queuePath2,key3=val3> | Semicolon separated values of queues to add and their queue configurations. This example adds queue "queuePath1" (a full path name), which has queue configurations key1=val1 and key2=val2. It also adds queue "queuePath2", which has queue configuration key3=val3. | -| -remove <queuePath1,queuePath2> | Comma-separated queues to remove. This example removes queuePath1 and queuePath2 queues (full path names). **Note:** Queues must be put into `STOPPED` state before they are deleted. | -| -update <queuePath1,key1=val1,key2=val2;queuePath2,key3=val3> | Semicolon separated values of queues whose configurations should be updated. This example sets key1=val1 and key2=val2 for queue configuration of queuePath1 (full path name), and sets key3=val3 for queue configuration of queuePath2. | +| -add <"queuePath1:key1=val1,key2=val2;queuePath2:key3=val3"> | Semicolon separated values of queues to add and their queue configurations. This example adds queue "queuePath1" (a full path name), which has queue configurations key1=val1 and key2=val2. It also adds queue "queuePath2", which has queue configuration key3=val3. | +| -remove <"queuePath1;queuePath2"> | Semicolon separated queues to remove. This example removes queuePath1 and queuePath2 queues (full path names). **Note:** Queues must be put into `STOPPED` state before they are deleted. | +| -update <"queuePath1:key1=val1,key2=val2;queuePath2:key3=val3"> | Semicolon separated values of queues whose configurations should be updated. This example sets key1=val1 and key2=val2 for queue configuration of queuePath1 (full path name), and sets key3=val3 for queue configuration of queuePath2. | | -global <key1=val1,key2=val2> | Update scheduler global configurations. This example sets key1=val1 and key2=val2 for scheduler's global configuration. | Updates scheduler configuration --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org