YARN-11049. MutableConfScheduler is referred as plain String instead of class name. Contributed by Szilard Nemeth
This commit is contained in:
parent
8f07081789
commit
851a4dc2d9
|
@ -1864,8 +1864,8 @@ public class ResourceManager extends CompositeService
|
|||
confStore.initialize(conf, conf, rmContext);
|
||||
confStore.format();
|
||||
} else {
|
||||
System.out.println("Scheduler Configuration format only " +
|
||||
"supported by MutableConfScheduler.");
|
||||
System.out.println(String.format("Scheduler Configuration format only " +
|
||||
"supported by %s.", MutableConfScheduler.class.getSimpleName()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2678,7 +2678,7 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
|
|||
} else {
|
||||
return Response.status(Status.BAD_REQUEST)
|
||||
.entity("Scheduler Configuration format only supported by " +
|
||||
"MutableConfScheduler.").build();
|
||||
MutableConfScheduler.class.getSimpleName()).build();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2727,8 +2727,8 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
|
|||
.build();
|
||||
}
|
||||
} else {
|
||||
String errorMsg = "Configuration change validation only supported by " +
|
||||
"MutableConfScheduler.";
|
||||
String errorMsg = String.format("Configuration change validation only supported by %s.",
|
||||
MutableConfScheduler.class.getSimpleName());
|
||||
LOG.warn(errorMsg);
|
||||
return Response.status(Status.BAD_REQUEST)
|
||||
.entity(errorMsg)
|
||||
|
@ -2823,10 +2823,11 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
|
|||
.build();
|
||||
} else {
|
||||
return Response.status(Status.BAD_REQUEST).entity(
|
||||
"This API only supports to retrieve scheduler configuration"
|
||||
+ " from a mutable-conf scheduler, underneath scheduler "
|
||||
+ scheduler.getClass().getSimpleName()
|
||||
+ " is not an instance of MutableConfScheduler")
|
||||
String.format("This API only supports to retrieve scheduler configuration"
|
||||
+ " from a mutable-conf scheduler, underneath scheduler %s"
|
||||
+ " is not an instance of %s",
|
||||
scheduler.getClass().getSimpleName(),
|
||||
MutableConfScheduler.class.getSimpleName()))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
@ -2858,8 +2859,8 @@ public class RMWebServices extends WebServices implements RMWebServiceProtocol {
|
|||
}
|
||||
} else {
|
||||
return Response.status(Status.BAD_REQUEST)
|
||||
.entity("Configuration Version only supported by "
|
||||
+ "MutableConfScheduler.").build();
|
||||
.entity(String.format("Configuration Version only supported by %s.",
|
||||
MutableConfScheduler.class.getSimpleName())).build();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -75,6 +75,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.*;
|
|||
import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppMetrics;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.MutableConfScheduler;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
|
||||
|
@ -1003,8 +1004,8 @@ public class TestRMWebServices extends JerseyTestBase {
|
|||
Assert.assertEquals(Status.BAD_REQUEST
|
||||
.getStatusCode(), response.getStatus());
|
||||
Assert.assertTrue(response.getEntity().toString()
|
||||
.contains("Configuration change validation only supported by"
|
||||
+" MutableConfScheduler."));
|
||||
.contains(String.format("Configuration change validation only supported by %s.",
|
||||
MutableConfScheduler.class.getSimpleName())));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue