From 952d707240cb7dd088820d8b39e705b77fa3b6c4 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Sat, 28 Jan 2023 14:19:19 +0530 Subject: [PATCH] HADOOP-18604. Add compile platform in the hadoop version output. (#5327). Contributed by Ayush Saxena. Signed-off-by: Chris Nauroth --- .../java/org/apache/hadoop/util/VersionInfo.java | 13 +++++++++++++ .../main/resources/common-version-info.properties | 1 + 2 files changed, 14 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java index ea835023e8..31fe3c6377 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionInfo.java @@ -93,6 +93,10 @@ protected String _getProtocVersion() { return info.getProperty("protocVersion", "Unknown"); } + protected String _getCompilePlatform() { + return info.getProperty("compilePlatform", "Unknown"); + } + private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("common"); /** * Get the Hadoop version. @@ -167,12 +171,21 @@ public static String getProtocVersion(){ return COMMON_VERSION_INFO._getProtocVersion(); } + /** + * Returns the OS platform used for the build. + * @return the OS platform + */ + public static String getCompilePlatform() { + return COMMON_VERSION_INFO._getCompilePlatform(); + } + public static void main(String[] args) { LOG.debug("version: "+ getVersion()); System.out.println("Hadoop " + getVersion()); System.out.println("Source code repository " + getUrl() + " -r " + getRevision()); System.out.println("Compiled by " + getUser() + " on " + getDate()); + System.out.println("Compiled on platform " + getCompilePlatform()); System.out.println("Compiled with protoc " + getProtocVersion()); System.out.println("From source with checksum " + getSrcChecksum()); System.out.println("This command was run using " + diff --git a/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties b/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties index 6f8558b8d4..0f075c8139 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties +++ b/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties @@ -24,3 +24,4 @@ date=${version-info.build.time} url=${version-info.scm.uri} srcChecksum=${version-info.source.md5} protocVersion=${hadoop.protobuf.version} +compilePlatform=${os.detected.classifier}