merge -r 1375082:1375083 from trunk. FIXES: YARN-27

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375084 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-08-20 16:06:25 +00:00
parent 8a5ab9229d
commit d6c75fbbb1
1 changed files with 1 additions and 1 deletions

View File

@ -238,11 +238,11 @@ public class TestQueueMetrics {
@Test @Test
public void testMetricsCache() { public void testMetricsCache() {
MetricsSystem ms = new MetricsSystemImpl("cache"); MetricsSystem ms = new MetricsSystemImpl("cache");
ms.start();
try { try {
String p1 = "root1"; String p1 = "root1";
String leafQueueName = "root1.leaf"; String leafQueueName = "root1.leaf";
ms.start();
QueueMetrics p1Metrics = QueueMetrics p1Metrics =
QueueMetrics.forQueue(ms, p1, null, true, conf); QueueMetrics.forQueue(ms, p1, null, true, conf);