From 16c607ca2b43f83b56bbbb4367ca8633096b7000 Mon Sep 17 00:00:00 2001 From: Sangjin Lee Date: Wed, 1 Mar 2017 15:29:17 -0800 Subject: [PATCH] YARN-6027 addendum. Fixed the broken build for YARN-5355-branch-2. Contributed by Sangjin Lee. --- .../AbstractTimelineReaderHBaseTestBase.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java index 7853c948aeb..ccfdfd0ee39 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java @@ -86,19 +86,7 @@ protected static void initialize() throws Exception { "org.apache.hadoop.yarn.server.timelineservice.storage." + "HBaseTimelineReaderImpl"); config.setInt("hfile.format.version", 3); - server = new TimelineReaderServer() { - @Override - protected void setupOptions(Configuration conf) { - // The parent code tries to use HttpServer2 from this version of - // Hadoop, but the tests are loading in HttpServer2 from - // ${hbase-compatible-hadoop.version}. This version uses Jetty 9 - // while ${hbase-compatible-hadoop.version} uses Jetty 6, and there - // are many differences, including classnames and packages. - // We do nothing here, so that we don't cause a NoSuchMethodError. - // Once ${hbase-compatible-hadoop.version} is changed to Hadoop 3, - // we should be able to remove this @Override. - } - }; + server = new TimelineReaderServer(); server.init(config); server.start(); serverPort = server.getWebServerPort(); @@ -119,11 +107,11 @@ protected ClientResponse getResponse(Client client, URI uri) ClientResponse resp = client.resource(uri).accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON).get(ClientResponse.class); - if (resp == null || resp.getStatusInfo() - .getStatusCode() != ClientResponse.Status.OK.getStatusCode()) { + if (resp == null || + resp.getClientResponseStatus() != ClientResponse.Status.OK) { String msg = ""; if (resp != null) { - msg = String.valueOf(resp.getStatusInfo().getStatusCode()); + msg = String.valueOf(resp.getClientResponseStatus()); } throw new IOException( "Incorrect response from timeline reader. " + "Status=" + msg); @@ -137,7 +125,7 @@ protected void verifyHttpResponse(Client client, URI uri, Status status) { .type(MediaType.APPLICATION_JSON).get(ClientResponse.class); assertNotNull(resp); assertTrue("Response from server should have been " + status, - resp.getStatusInfo().getStatusCode() == status.getStatusCode()); + resp.getClientResponseStatus() == status); System.out.println("Response is: " + resp.getEntity(String.class)); }