You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/01 12:48:19 UTC
[08/12] incubator-slider git commit: SLIDER-948 explicitly add
hadoop-hdfs to build
SLIDER-948 explicitly add hadoop-hdfs to build
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9d7a20b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9d7a20b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9d7a20b4
Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2
Commit: 9d7a20b46011ad4b6e535b29a33b021a56aaf310
Parents: fb38ea7
Author: Steve Loughran <st...@apache.org>
Authored: Tue Oct 27 13:38:04 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Oct 27 13:38:09 2015 +0000
----------------------------------------------------------------------
pom.xml | 30 +++++++++++++++++++-
slider-core/pom.xml | 6 ++++
.../org/apache/slider/client/SliderClient.java | 2 ++
.../server/appmaster/SliderAppMaster.java | 4 ++-
4 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9d7a20b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc45939..e6a20b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -524,7 +524,7 @@
<!-- hadoop-client includes the following jars, so they do not need to be
included separately:
- hadoop-common, hadoop-hdfs, hadoop-mapreduce-client-app,
+ hadoop-common, hadoop-hdfs (client?), hadoop-mapreduce-client-app,
hadoop-yarn-api, hadoop-mapreduce-client-core,
hadoop-mapreduce-client-jobclient, and hadoop-annotations
-->
@@ -552,6 +552,34 @@
</exclusions>
</dependency>
+ <!--
+ Hadoop HDFS is pulled in to guarantee that any split to hadoop-hdfs-client doesn't
+ break the build.
+ -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- hadoop-minicluster includes the following test-jars, so they do not
need to be included separately:
hadoop-common, hadoop-hdfs, hadoop-yarn-server-tests,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9d7a20b4/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 201a26e..86684f6 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -260,6 +260,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9d7a20b4/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 7698b64..0fcf586 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.fs.PathNotFoundException;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.registry.client.api.RegistryConstants;
import org.apache.hadoop.registry.client.api.RegistryOperations;
@@ -291,6 +292,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
*/
public SliderClient() {
super("Slider Client");
+ new HdfsConfiguration();
new YarnConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9d7a20b4/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 7bfd59f..e1e572d 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.http.HttpConfig;
import org.apache.hadoop.io.DataOutputBuffer;
@@ -82,7 +83,6 @@ import org.apache.slider.api.StatusKeys;
import org.apache.slider.api.proto.SliderClusterAPI;
import org.apache.slider.common.SliderExitCodes;
import org.apache.slider.common.SliderKeys;
-import org.apache.slider.common.SliderXmlConfKeys;
import org.apache.slider.common.params.AbstractActionArgs;
import org.apache.slider.common.params.SliderAMArgs;
import org.apache.slider.common.params.SliderAMCreateAction;
@@ -220,6 +220,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
* Deployed in {@link #serviceInit(Configuration)}
*/
private final MetricsAndMonitoring metricsAndMonitoring = new MetricsAndMonitoring();
+
/**
* metrics registry
*/
@@ -417,6 +418,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
*/
public SliderAppMaster() {
super(SERVICE_CLASSNAME_SHORT);
+ new HdfsConfiguration();
new YarnConfiguration();
}