Repository: oozie Updated Branches: refs/heads/master a54f7c20d -> 50b92932f
OOZIE-2004 Improve Oozie version info output (Artem Ervits via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/50b92932 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/50b92932 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/50b92932 Branch: refs/heads/master Commit: 50b92932f54d46e342403acaa33b7ae1a524328c Parents: a54f7c2 Author: Gezapeti Cseh <[email protected]> Authored: Fri Jul 14 09:28:06 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Fri Jul 14 09:28:06 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/oozie/BuildInfo.java | 4 ++-- .../main/java/org/apache/oozie/cli/OozieCLI.java | 14 ++++++++++++-- .../java/org/apache/oozie/client/OozieClient.java | 4 ++-- .../org/apache/oozie/client/rest/JsonTags.java | 2 +- .../apache/oozie/servlet/BaseAdminServlet.java | 2 +- .../org/apache/oozie/client/TestOozieCLI.java | 18 ++++++++++++++---- .../apache/oozie/client/TestWorkflowClient.java | 2 +- .../apache/oozie/servlet/TestAdminServlet.java | 4 ++-- .../apache/oozie/servlet/TestV1AdminServlet.java | 4 ++-- release-log.txt | 1 + 10 files changed, 38 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/client/src/main/java/org/apache/oozie/BuildInfo.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/BuildInfo.java b/client/src/main/java/org/apache/oozie/BuildInfo.java index 2bd484c..a3d1e4d 100644 --- a/client/src/main/java/org/apache/oozie/BuildInfo.java +++ b/client/src/main/java/org/apache/oozie/BuildInfo.java @@ -18,6 +18,7 @@ package org.apache.oozie; +import java.io.IOException; import java.util.Properties; /** @@ -42,7 +43,7 @@ public class BuildInfo { try { BUILD_INFO.load(BuildInfo.class.getClassLoader().getResourceAsStream("oozie-buildinfo.properties")); } - catch (Exception e) { + catch (IOException e) { throw new RuntimeException(e); } } @@ -58,5 +59,4 @@ public class BuildInfo { public static Properties getBuildInfo() { return BUILD_INFO; } - } http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/client/src/main/java/org/apache/oozie/cli/OozieCLI.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java index 4adf1a8..a7983f0 100644 --- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java +++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java @@ -1960,8 +1960,18 @@ public class OozieCLI { } private void versionCommand() throws OozieCLIException { - System.out.println("Oozie client build version: " - + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION)); + StringBuilder sb = new StringBuilder(); + sb.append("Oozie client build version: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION)) + .append("\nSource code repository: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VC_URL)) + .append("\nCompiled by ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_USER_NAME)) + .append(" on ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_TIME)) + .append("\nFrom source with checksum: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VC_REVISION)); + System.out.println(sb.toString()); } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/client/src/main/java/org/apache/oozie/client/OozieClient.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java b/client/src/main/java/org/apache/oozie/client/OozieClient.java index f9063de..b989a33 100644 --- a/client/src/main/java/org/apache/oozie/client/OozieClient.java +++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java @@ -2167,7 +2167,7 @@ public class OozieClient { if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) { Reader reader = new InputStreamReader(conn.getInputStream()); JSONObject json = (JSONObject) JSONValue.parse(reader); - return (String) json.get(JsonTags.BUILD_VERSION); + return (String) json.get(JsonTags.BUILD_INFO); } else { handleError(conn); @@ -2364,7 +2364,7 @@ public class OozieClient { * Return the Oozie server build version. * * @return the Oozie server build version. - * @throws OozieClientException throw if it the server build version could not be retrieved. + * @throws OozieClientException throw if the server build version could not be retrieved. */ public String getServerBuildVersion() throws OozieClientException { return new GetBuildVersion().call(); http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java b/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java index 7b6f50c..3ec4cca 100644 --- a/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java +++ b/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java @@ -25,7 +25,7 @@ public interface JsonTags { String OOZIE_SAFE_MODE = "safeMode"; //Applicable for V0 only String OOZIE_SYSTEM_MODE = "systemMode"; - String BUILD_VERSION = "buildVersion"; + String BUILD_INFO = "buildInfo"; String QUEUE_DUMP = "queueDump"; String CALLABLE_DUMP = "callableDump"; String UNIQUE_MAP_DUMP = "uniqueMapDump"; http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java b/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java index d263567..890097b 100644 --- a/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java +++ b/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java @@ -146,7 +146,7 @@ public abstract class BaseAdminServlet extends JsonRestServlet { } else if (resource.equals(RestConstants.ADMIN_BUILD_VERSION_RESOURCE)) { JSONObject json = new JSONObject(); - json.put(JsonTags.BUILD_VERSION, BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION)); + json.put(JsonTags.BUILD_INFO, BuildInfo.getBuildInfo().toString()); sendJsonResponse(response, HttpServletResponse.SC_OK, json); } else if (resource.equals(RestConstants.ADMIN_QUEUE_DUMP_RESOURCE)) { http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java index 26411aa..6fcdf24 100644 --- a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java +++ b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java @@ -31,7 +31,6 @@ import java.util.concurrent.Callable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import org.apache.oozie.BaseEngine; import org.apache.oozie.BuildInfo; import org.apache.oozie.cli.CLIParser; import org.apache.oozie.cli.OozieCLI; @@ -984,7 +983,7 @@ public class TestOozieCLI extends DagServletTestCase { String oozieUrl = getContextURL(); String[] args = new String[]{"admin", "-version", "-oozie", oozieUrl}; String out = runOozieCLIAndGetStdout(args); - assertEquals("Oozie server build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION) + + assertEquals("Oozie server build version: " + BuildInfo.getBuildInfo() + SYSTEM_LINE_SEPARATOR, out); return null; @@ -1050,8 +1049,19 @@ public class TestOozieCLI extends DagServletTestCase { public void testClientBuildVersion() throws Exception { String[] args = new String[]{"version"}; String out = runOozieCLIAndGetStdout(args); - assertEquals("Oozie client build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION) + - SYSTEM_LINE_SEPARATOR, out); + StringBuilder sb = new StringBuilder(); + sb.append("Oozie client build version: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION)) + .append("\nSource code repository: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VC_URL)) + .append("\nCompiled by ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_USER_NAME)) + .append(" on ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_TIME)) + .append("\nFrom source with checksum: ") + .append(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VC_REVISION)); + + assertEquals(sb.toString() + SYSTEM_LINE_SEPARATOR, out); } public void testJobInfo() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java b/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java index badbb16..fdd04d3 100644 --- a/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java +++ b/core/src/test/java/org/apache/oozie/client/TestWorkflowClient.java @@ -412,7 +412,7 @@ public class TestWorkflowClient extends DagServletTestCase { public Void call() throws Exception { String oozieUrl = getContextURL(); OozieClient wc = new OozieClient(oozieUrl); - assertEquals(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION), + assertEquals(BuildInfo.getBuildInfo().toString(), wc.getServerBuildVersion()); return null; } http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/core/src/test/java/org/apache/oozie/servlet/TestAdminServlet.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/servlet/TestAdminServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestAdminServlet.java index 8e3502c..595cb26 100644 --- a/core/src/test/java/org/apache/oozie/servlet/TestAdminServlet.java +++ b/core/src/test/java/org/apache/oozie/servlet/TestAdminServlet.java @@ -212,8 +212,8 @@ public class TestAdminServlet extends DagServletTestCase { assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode()); assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE)); JSONObject json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream())); - assertEquals(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION), - json.get(JsonTags.BUILD_VERSION)); + assertEquals(BuildInfo.getBuildInfo().toString(), + json.get(JsonTags.BUILD_INFO)); return null; } }); http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java index a3f3b9c..1e66537 100644 --- a/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java +++ b/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java @@ -218,8 +218,8 @@ public class TestV1AdminServlet extends DagServletTestCase { assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode()); assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE)); JSONObject json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream())); - assertEquals(BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION), - json.get(JsonTags.BUILD_VERSION)); + assertEquals(BuildInfo.getBuildInfo().toString(), + json.get(JsonTags.BUILD_INFO)); return null; } }); http://git-wip-us.apache.org/repos/asf/oozie/blob/50b92932/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7443f2c..f780bb2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2004 Improve Oozie version info output (Artem Ervits via gezapeti) OOZIE-2854 Oozie should handle transient database problems (andras.piros via gezapeti) OOZIE-2371 Add docs for state transitions for WF Action states (daniel.becker via gezapeti) OOZIE-2911 Re-add test testWfActionKillChildJob and adapt it to OYA (gezapeti)
