82 lines
4.3 KiB
Diff
82 lines
4.3 KiB
Diff
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
|
|
index b315e2b..9ad8bcd 100644
|
|
--- a/hadoop-project/pom.xml
|
|
+++ b/hadoop-project/pom.xml
|
|
@@ -400,7 +400,7 @@
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
- <version>11.0.2</version>
|
|
+ <version>20.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.code.gson</groupId>
|
|
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
|
|
index d55c80b..4505aa9 100644
|
|
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
|
|
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
|
|
@@ -67,7 +67,7 @@ class XAttrCommands extends FsCommand {
|
|
"0x and 0s, respectively.\n" +
|
|
"<path>: The file or directory.\n";
|
|
private final static Function<String, XAttrCodec> enValueOfFunc =
|
|
- Enums.valueOfFunction(XAttrCodec.class);
|
|
+ Enums.stringConverter(XAttrCodec.class);
|
|
|
|
private String name = null;
|
|
private boolean dump = false;
|
|
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
|
|
index 8656ae9..f78f6be 100644
|
|
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
|
|
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
|
|
@@ -1160,7 +1160,7 @@ public class DataStorage extends Storage {
|
|
}
|
|
linkWorkers.shutdown();
|
|
for (Future<Void> f : futures) {
|
|
- Futures.get(f, IOException.class);
|
|
+ Futures.getChecked(f, IOException.class);
|
|
}
|
|
}
|
|
|
|
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
|
|
index 1f9e3e9..961b158 100644
|
|
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
|
|
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java
|
|
@@ -18,7 +18,6 @@
|
|
|
|
package org.apache.hadoop.hdfs;
|
|
|
|
-import com.google.common.collect.Iterators;
|
|
import org.apache.hadoop.classification.InterfaceAudience;
|
|
import org.apache.hadoop.classification.InterfaceStability;
|
|
import org.apache.hadoop.hdfs.inotify.EventBatch;
|
|
@@ -33,6 +32,7 @@ import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import java.io.IOException;
|
|
+import java.util.Collections;
|
|
import java.util.Iterator;
|
|
import java.util.Random;
|
|
import java.util.concurrent.TimeUnit;
|
|
@@ -77,7 +77,7 @@ public class DFSInotifyEventInputStream {
|
|
long lastReadTxid) throws IOException {
|
|
this.traceSampler = traceSampler;
|
|
this.namenode = namenode;
|
|
- this.it = Iterators.emptyIterator();
|
|
+ this.it = Collections.emptyIterator();
|
|
this.lastReadTxid = lastReadTxid;
|
|
}
|
|
|
|
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
|
|
index 2ee2ba7..d60b277 100644
|
|
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
|
|
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
|
|
@@ -1052,7 +1052,7 @@ public class ClientRMService extends AbstractService implements
|
|
new RMAppMoveEvent(applicationId, request.getTargetQueue(), future));
|
|
|
|
try {
|
|
- Futures.get(future, YarnException.class);
|
|
+ Futures.getChecked(future, YarnException.class);
|
|
} catch (YarnException ex) {
|
|
RMAuditLogger.logFailure(callerUGI.getShortUserName(),
|
|
AuditConstants.MOVE_APP_REQUEST, "UNKNOWN", "ClientRMService",
|