Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04ea922f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04ea922f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04ea922f Branch: refs/heads/ignite-3185 Commit: 04ea922f949308b5ca3a559d0ab0512d05216c50 Parents: 75601f8 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Jun 28 13:17:57 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Jun 28 13:17:57 2016 +0300 ---------------------------------------------------------------------- .../processors/hadoop/HadoopClasspathUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/04ea922f/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java index c83231e..f84b093 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java @@ -135,21 +135,21 @@ public class HadoopClasspathUtils { hadoopHome + "/share/hadoop/hdfs", hadoopHome + "/share/hadoop/mapreduce")); // Probe for CDH with normal HADOOP_HOME directory. + probes.add(new HadoopLocations(hadoopHome, hadoopHome, + hadoopHome + "/../hadoop-hdfs", hadoopHome + "/../hadoop-mapreduce")); + + // Probe for CDH with HADOOP_HOME set to parent directory. probes.add(new HadoopLocations(hadoopHome, hadoopHome + "/hadoop", hadoopHome + "/hadoop-hdfs", hadoopHome + "/hadoop-mapreduce")); - // Probe for CDH with HADOOP_HOME equal to HADOOP_COMMON_HOME. + // Probe for HDP with normal HADOOP_HOME directory. probes.add(new HadoopLocations(hadoopHome, hadoopHome, - hadoopHome + "/../hadoop-hdfs", hadoopHome + "/../hadoop-mapreduce")); + hadoopHome + "/../hadoop-hdfs-client", hadoopHome + "/../hadoop-mapreduce-client")); - // Probe for HDP with normal HADOOP_HOME directory. + // Probe for HDP with HADOOP_HOME set to parent directory. probes.add(new HadoopLocations(hadoopHome, hadoopHome + "/hadoop-client,", hadoopHome + "/hadoop-hdfs-client", hadoopHome + "/hadoop-mapreduce-client")); - // Probe for HDP with HADOOP_HOME equal to HADOOP_COMMON_HOME. - probes.add(new HadoopLocations(hadoopHome, hadoopHome, - hadoopHome + "/../hadoop-hdfs-client", hadoopHome + "/../hadoop-mapreduce-client")); - for (HadoopLocations probe : probes) { if (probe.valid()) return probe;
