diff options
author | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-18 14:40:17 +0200 |
---|---|---|
committer | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-18 15:13:24 +0200 |
commit | ce7a90324a0768383da82c84e148e53c840777fd (patch) | |
tree | 0cc8469f02f7653ec885a91c30834981eac86c76 | |
parent | 4a46f72283fe35cba7308b17b64de348346c4218 (diff) |
Replace HTTP response with Log class. Other cleanup
11 files changed, 62 insertions, 38 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 6ed496a56fb..6c67f730f60 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -484,9 +484,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye // ---------------- Logs ---------------------------------------------------------------- public HttpResponse getLogs(ApplicationId applicationId, String apiParams) { - String logServerHostName = getLogServerURI(applicationId) + "/" + apiParams; + String logServerURI = getLogServerURI(applicationId) + apiParams; LogRetriever logRetriever = new LogRetriever(); - return logRetriever.getLogs(logServerHostName); + return logRetriever.getLogs(logServerURI); } // ---------------- Session operations ---------------------------------------------------------------- diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java index 746ed8635e0..528575f4f27 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java @@ -97,16 +97,8 @@ public class ApplicationHandler extends HttpHandler { } if (isLogRequest(request)) { - String apiParams = "?"; - if (request.hasProperty("from")) { - apiParams = apiParams + "from=" + request.getProperty("from") + "&"; - } - if (request.hasProperty("to")) { - apiParams = apiParams + "to=" + request.getProperty("to"); - } - StringBuilder api = new StringBuilder("?"); - request.propertyMap().entrySet().stream().forEach(entry -> api.append(entry.getKey() + "=" + entry.getValue() + "&")); - apiParams = getPathSuffix(request); + String apiParams = request.getUri().getQuery(); + apiParams = apiParams == null ? "" : "?" + apiParams; return applicationRepository.getLogs(applicationId, apiParams); } @@ -155,7 +147,7 @@ public class ApplicationHandler extends HttpHandler { "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*", "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*", "http://*/application/v2/tenant/*/application/*", - "http://*/application/v2/tenant/*/application/*/logs/*"); + "http://*/application/v2/tenant/*/application/*/logs"); } private static boolean isLogRequest(HttpRequest request) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 120119f35bb..2ae8917e905 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -118,7 +118,7 @@ public class ApplicationRepositoryTest { } @Test - public void getLogs(){ + public void getLogs() { WireMockServer wireMock = new WireMockServer(wireMockConfig().port(8080)); wireMock.start(); WireMock.configureFor("localhost", wireMock.port()); @@ -127,15 +127,15 @@ public class ApplicationRepositoryTest { .withStatus(200))); wireMock.start(); deployApp(testAppLogServerWithContainer); - HttpResponse response = applicationRepository.getLogs(applicationId()); - assertEquals(response.getStatus(),200); + HttpResponse response = applicationRepository.getLogs(applicationId(), ""); + assertEquals(200, response.getStatus()); wireMock.stop(); } @Test(expected = IllegalArgumentException.class) public void getLogsNoContainerOnLogServerHostShouldThrowException() { deployApp(testApp); - applicationRepository.getLogs(applicationId()); + applicationRepository.getLogs(applicationId(), ""); } @Test diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java index 16f1b3ac62c..4c12bacf145 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java @@ -10,7 +10,6 @@ import org.json.JSONObject; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.net.URI; import java.util.Arrays; import java.util.HashMap; import java.util.concurrent.Executor; @@ -26,14 +25,15 @@ public class LogHandler extends ThreadedHttpRequestHandler { @Override public HttpResponse handle(HttpRequest request) { - JSONObject logJson; + JSONObject responseJSON = new JSONObject(); HashMap<String, String> apiParams = getParameters(request); long earliestLogThreshold = getEarliestThreshold(apiParams); long latestLogThreshold = getLatestThreshold(apiParams); LogReader logReader= new LogReader(earliestLogThreshold, latestLogThreshold); try { - logJson = logReader.readLogs(LOG_DIRECTORY); + JSONObject logJson = logReader.readLogs(LOG_DIRECTORY); + responseJSON.put("logs", logJson.toString()); } catch (IOException | JSONException e) { return new HttpResponse(404) { @Override @@ -44,7 +44,7 @@ public class LogHandler extends ThreadedHttpRequestHandler { @Override public void render(OutputStream outputStream) throws IOException { OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream); - outputStreamWriter.write(logJson.toString()); + outputStreamWriter.write(responseJSON.toString()); outputStreamWriter.close(); } }; diff --git a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java index 1a8d5680882..534026f89ac 100644 --- a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java +++ b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java @@ -22,7 +22,7 @@ public class LogReaderTest { String logDirectory = "src/test/resources/logfolder/"; LogReader logReader = new LogReader(21, Long.MAX_VALUE); JSONObject json = logReader.readLogs(logDirectory); - String expected = "{\"subfolder\":{\"log2.log\":\"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl\"},\"log1.log\":\"VGhpcyBpcyBvbmUgbG9nIGZpbGU=\"}"; + String expected = "{\"subfolder-log2.log\":\"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl\",\"log1.log\":\"VGhpcyBpcyBvbmUgbG9nIGZpbGU=\"}"; String actual = json.toString(); assertEquals(expected, actual); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index 50749f3da82..5dacaf9b0db 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.configserver; -import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; @@ -9,6 +8,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.Hostname; import com.yahoo.vespa.serviceview.bindings.ApplicationView; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -42,7 +42,7 @@ public interface ConfigServer { Map<?,?> getServiceApiResponse(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath); - HttpResponse getLogs(DeploymentId deployment, String apiParams); + Optional<Logs> getLogs(DeploymentId deployment, HashMap<String, String> queryParameters); /** * Set new status on en endpoint in one zone. * diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java new file mode 100644 index 00000000000..223d3e88f13 --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java @@ -0,0 +1,16 @@ +package com.yahoo.vespa.hosted.controller.api.integration.configserver; + +import java.util.Map; + +public class Logs { + + private final Map<String, String> logs; + + public Logs(Map<String, String> logs) { + this.logs = logs; + } + + public Map<String, String> logs() { + return this.logs; + } +} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index f3135d7b0af..154c4e632de 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -49,6 +49,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFact import com.yahoo.vespa.hosted.controller.api.integration.athenz.ZmsException; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Log; +import com.yahoo.vespa.hosted.controller.api.integration.configserver.Logs; import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType; import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId; import com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus; @@ -87,7 +88,9 @@ import java.net.URISyntaxException; import java.security.Principal; import java.time.DayOfWeek; import java.time.Duration; +import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -168,7 +171,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { if (path.matches("/application/v4/tenant/{tenant}")) return tenant(path.get("tenant"), request); if (path.matches("/application/v4/tenant/{tenant}/application")) return applications(path.get("tenant"), request); if (path.matches("/application/v4/tenant/{tenant}/application/{application}")) return application(path.get("tenant"), path.get("application"), request); - if (path.matches("/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/logs/{*}")) return logs(path.get("tenant"), path.get("application"), path.get("instance"), path.get("environment"), path.get("'region"), path.getRest()); + if (path.matches("/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/instance/{instance}/logs")) return logs(path.get("tenant"), path.get("application"), path.get("instance"), path.get("environment"), path.get("region"), request.getUri().getQuery()); if (path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/job")) return JobControllerApiHandlerHelper.jobTypeResponse(controller, appIdFromPath(path), request.getUri()); if (path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/job/{jobtype}")) return JobControllerApiHandlerHelper.runResponse(controller.jobController().runs(appIdFromPath(path), jobTypeFromPath(path)), request.getUri()); if (path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/job/{jobtype}/run/{number}")) return JobControllerApiHandlerHelper.runDetailsResponse(controller.jobController(), runIdFromPath(path), request.getProperty("after")); @@ -346,11 +349,27 @@ public class ApplicationApiHandler extends LoggingRequestHandler { return new SlimeJsonResponse(slime); } - private HttpResponse logs(String tenantName, String applicationName, String instanceName, String environment, String region, String apiParams) { + private HttpResponse logs(String tenantName, String applicationName, String instanceName, String environment, String region, String query) { ApplicationId application = ApplicationId.from(tenantName, applicationName, instanceName); ZoneId zone = ZoneId.from(environment, region); DeploymentId deployment = new DeploymentId(application, zone); - return controller.configServer().getLogs(deployment,apiParams); + HashMap<String, String> queryParameters = getParameters(query); + Optional<Logs> response = controller.configServer().getLogs(deployment, queryParameters); + Slime slime = new Slime(); + Cursor object = slime.setObject(); + if (response.isPresent()) { + response.get().logs().entrySet().stream().forEach(entry -> object.setString(entry.getKey(), entry.getValue())); + } + return new SlimeJsonResponse(slime); + } + + private HashMap<String, String> getParameters(String query) { + HashMap<String, String> keyValPair = new HashMap<>(); + Arrays.stream(query.split("&")).forEach(pair -> { + String[] splitPair = pair.split("="); + keyValPair.put(splitPair[0], splitPair[1]); + }); + return keyValPair; } private void toSlime(Cursor object, Application application, HttpRequest request) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index bd65465633e..aea809de365 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -17,6 +17,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.Identifier; import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServer; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Log; +import com.yahoo.vespa.hosted.controller.api.integration.configserver.Logs; import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node; import com.yahoo.vespa.hosted.controller.api.integration.configserver.PrepareResponse; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ServiceConvergence; @@ -298,14 +299,11 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer } @Override - public HttpResponse getLogs(DeploymentId deployment) { - return new HttpResponse(200) { - @Override - public void render(OutputStream outputStream) throws IOException { - outputStream.write("{\"subfolder\":{\"log2.log\":\"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl\"},\"log1.log\":\"VGhpcyBpcyBvbmUgbG9nIGZpbGU=\"}".getBytes()); - } - }; - + public Optional<Logs> getLogs(DeploymentId deployment, HashMap<String, String> queryParameters) { + HashMap<String, String> logs = new HashMap<>(); + logs.put("subfolder-log2.log", "VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl"); + logs.put("log1.log", "VGhpcyBpcyBvbmUgbG9nIGZpbGU="); + return Optional.of(new Logs(logs)); } public static class Application { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 0ea23ae1b78..30c81a0721a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -331,7 +331,7 @@ public class ApplicationApiTest extends ControllerContainerTest { new File("application1-recursive.json")); // GET logs - tester.assertResponse(request("/application/v4/tenant/tenant2/application//application1/environment/prod/region/corp-us-east-1/instance/default/logs", GET).userIdentity(USER_ID), new File("logs.json")); + tester.assertResponse(request("/application/v4/tenant/tenant2/application//application1/environment/prod/region/corp-us-east-1/instance/default/logs?from=1233&to=3214", GET).userIdentity(USER_ID), new File("logs.json")); // DELETE (cancel) ongoing change tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deploying", DELETE) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/logs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/logs.json index 398a62758ee..69fc0f88ea6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/logs.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/logs.json @@ -1,5 +1,4 @@ { - "subfolder": { - "log2.log":"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl"}, + "subfolder-log2.log":"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl", "log1.log":"VGhpcyBpcyBvbmUgbG9nIGZpbGU=" }
\ No newline at end of file |