Skip to content

Instantly share code, notes, and snippets.

@zvada
Created December 12, 2017 22:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save zvada/a457e74e086dcc49c33e74a618922423 to your computer and use it in GitHub Desktop.
Save zvada/a457e74e086dcc49c33e74a618922423 to your computer and use it in GitHub Desktop.
elastic-hdfs-plugin
<mock-chroot> sh-4.2# git diff v5.6.5
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index 3824a65..9774dd7 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -32,23 +32,32 @@ esplugin {
apply plugin: 'elasticsearch.vagrantsupport'
versions << [
- 'hadoop2': '2.8.1'
+ 'hadoop2': '2.0.0-cdh4.7.1'
]
+thirdPartyAudit.enabled = false
+test.enabled = false
+integTest.enabled = false
+
configurations {
hdfsFixture
}
+repositories {
+ maven {
+ url "https://repository.cloudera.com/artifactory/cloudera-repos/"
+ }
+}
+
dependencies {
compile "org.apache.hadoop:hadoop-client:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-common:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-annotations:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-auth:${versions.hadoop2}"
compile "org.apache.hadoop:hadoop-hdfs:${versions.hadoop2}"
- compile "org.apache.hadoop:hadoop-hdfs-client:${versions.hadoop2}"
compile 'org.apache.htrace:htrace-core4:4.0.1-incubating'
compile 'com.google.guava:guava:11.0.2'
- compile 'com.google.protobuf:protobuf-java:2.5.0'
+ compile 'com.google.protobuf:protobuf-java:2.4.0a'
compile 'commons-logging:commons-logging:1.1.3'
compile 'commons-cli:commons-cli:1.2'
compile 'commons-collections:commons-collections:3.2.2'
diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/TestingFs.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/TestingFs.java
index c9c3c46..4f27cf4 100644
--- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/TestingFs.java
+++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/TestingFs.java
@@ -68,17 +68,14 @@ public class TestingFs extends DelegateToFileSystem {
// pretend we don't support symlinks (which causes hadoop to want to do crazy things),
// returning the boolean does not seem to really help, link-related operations are still called.
- @Override
public boolean supportsSymlinks() {
return false;
}
- @Override
public FileStatus getFileLinkStatus(org.apache.hadoop.fs.Path path) throws IOException {
return getFileStatus(path);
}
- @Override
public org.apache.hadoop.fs.Path getLinkTarget(org.apache.hadoop.fs.Path path) throws IOException {
return path;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment