Upgrade Hadoop and Hive to version 3

NOTICE.txt

@@ -14,9 +14,13 @@ developed by the Apache Lucene Project (http://lucene.apache.org)
 License: The Apache License, Version 2.0
 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-This product includes code derived from the Jackson project
-(https://github.com/FasterXML/jackson) for backwards compatibility
-purposes.
+This product includes code derived and repackaged from the Jackson project
+(https://github.com/FasterXML/jackson) for interoperability purposes.
+License: The Apache License, Version 2.0
+(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes repackaged from the Apache Commons HTTP Client project
+(https://hc.apache.org/httpclient-legacy/) for interoperability purposes.
 License: The Apache License, Version 2.0
 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1146,3 +1150,191 @@ jackson LICENSE
    See the License for the specific language governing permissions and
    limitations under the License.
 
+================================================================================
+apache commons http client NOTICE
+================================================================================
+Apache HttpComponents Commons HttpClient
+Copyright 1999-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+================================================================================
+apache commons http client LICENSE
+================================================================================
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BaseBuildPlugin.groovy

@@ -113,9 +113,13 @@ class BaseBuildPlugin implements Plugin<Project> {
             println "Using Gradle [${project.gradle.gradleVersion}]"
 
             // Hadoop versions
-            project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopYarn"
+            project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoop3"
             switch (project.rootProject.ext.hadoopDistro) {
             // Hadoop YARN/2.0.x
+                case "hadoop3":
+                    project.rootProject.ext.hadoopVersion = project.hadoop3Version
+                    println "Using Apache Hadoop on YARN [$project.hadoop3Version]"
+                    break
                 case "hadoopYarn":
                     project.rootProject.ext.hadoopVersion = project.hadoop2Version
                     println "Using Apache Hadoop on YARN [$project.hadoop2Version]"

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy

@@ -283,13 +283,6 @@ class BuildPlugin implements Plugin<Project>  {
                 // Locking on to joda 2.8
                 resolve.force('joda-time:joda-time:2.8')
 
-                // Ensure our jackson version is respected in the transient deps
-                resolve.force("org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
-                resolve.force("org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
-
-                // force the use of commons-http from Hadoop
-                resolve.force('commons-httpclient:commons-httpclient:3.0.1')
-
                 // used when using Elastic non-shaded version
                 resolve.force("commons-cli:commons-cli:1.2")
 

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopClusterFormationTasks.groovy

@@ -237,6 +237,11 @@ class HadoopClusterFormationTasks {
         setup = configureWriteConfigTask(taskName(prefix, node, 'configure'), project, setup, node)
         setup = configureExtraConfigFilesTask(taskName(prefix, node, 'extraConfig'), project, setup, node)
 
+        // Give the service descriptor a chance to provide service-specific setup tasks
+        SetupTaskFactory setupTaskFactory = new SetupTaskFactory(project, { String name -> taskName(prefix, node, name) }, setup)
+        node.config.getServiceDescriptor().configureSetupTasks(node.config, setupTaskFactory)
+        setup = setupTaskFactory.getLastSetupTask()
+
         // If the role for this instance is not a process, we skip creating start and stop tasks for it.
         if (!node.getConfig().getRoleDescriptor().isExecutableProcess()) {
             // Go through the given dependencies for the instance and if any of them are Fixtures, pick the stop tasks off
@@ -313,6 +318,7 @@ class HadoopClusterFormationTasks {
             from {
                 project.tarTree(project.resources.gzip(distributionConfiguration.files.first()))
             }
+            exclude(node.config.serviceDescriptor.excludeFromArchiveExtraction(node.config))
             into node.baseDir
         }
     }

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/ServiceDescriptor.groovy

@@ -22,6 +22,7 @@ package org.elasticsearch.hadoop.gradle.fixture.hadoop
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.hadoop.gradle.fixture.hadoop.conf.InstanceConfiguration
 import org.elasticsearch.hadoop.gradle.fixture.hadoop.conf.ServiceConfiguration
+import org.gradle.api.Task
 
 import static org.elasticsearch.hadoop.gradle.fixture.hadoop.conf.SettingsContainer.FileSettings
 
@@ -74,6 +75,12 @@ interface ServiceDescriptor {
      */
     String artifactName(ServiceConfiguration configuration)
 
+    /**
+     * Returns a collection of directories/files that can be excluded when extracting an archive. Some distributions
+     * include entire directories full of things we do not need in the fixture like documentation and example code.
+     */
+    Collection<String> excludeFromArchiveExtraction(InstanceConfiguration configuration)
+
     /**
      * The name of the directory under the base dir that contains the package contents.
      */
@@ -130,8 +137,16 @@ interface ServiceDescriptor {
     void finalizeEnv(Map<String, String> env, InstanceConfiguration configuration)
 
     /**
-     * A map of default setup commands to run for an instance. The name of the command
-     * is mapped to the command line contents.
+     * Configure a list of Gradle tasks that are specific to setting up this service. If a setup step needs
+     * to run scripts that are provided by the service installation's bin directory, use defaultSetupCommands
+     * instead.
+     */
+    void configureSetupTasks(InstanceConfiguration configuration, SetupTaskFactory taskFactory)
+
+    /**
+     * A map of default setup commands to run for an instance. Each entry's key is the taskName to use for the
+     * exec command, and value is the command line to execute. Every command is resolved against the instance's
+     * home directory. If you need to perform set up operations with Gradle tasks, use configureSetupTasks.
      */
     Map<String, Object[]> defaultSetupCommands(InstanceConfiguration configuration)
 }

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/SetupTaskFactory.groovy

@@ -0,0 +1,47 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.hadoop.gradle.fixture.hadoop
+
+import org.gradle.api.Project
+import org.gradle.api.Task
+
+import java.util.function.Function
+
+class SetupTaskFactory {
+
+    private final Project project
+    private final Function<String, String> taskNameGenerator
+    private Task setup
+
+    SetupTaskFactory(Project project, Function<String, String> taskNameGenerator, Task setup) {
+        this.project = project
+        this.taskNameGenerator = taskNameGenerator
+        this.setup = setup
+    }
+
+    Task createServiceSetupTask(String name, Class<?> task, Closure configure) {
+        setup = project.tasks.create(name: taskNameGenerator.apply(name), type: task, dependsOn: setup).configure(configure)
+        return setup
+    }
+
+    Task getLastSetupTask() {
+        return setup
+    }
+}