You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2020/02/14 10:34:05 UTC
[hadoop-ozone] branch master updated: HDDS-3000. Update guava
version to 28.2-jre
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ac2c656 HDDS-3000. Update guava version to 28.2-jre
ac2c656 is described below
commit ac2c656c4a1d139160114c6944e72c19e661a5f7
Author: Wei-Chiu Chuang <we...@cloudera.com>
AuthorDate: Fri Feb 14 11:27:35 2020 +0100
HDDS-3000. Update guava version to 28.2-jre
Closes #545
---
.../container/common/volume/HddsVolumeChecker.java | 45 +++++++++++++---------
.../common/volume/ThrottledAsyncChecker.java | 4 +-
.../replication/TestReplicationSupervisor.java | 6 +--
hadoop-ozone/csi/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolumeChecker.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolumeChecker.java
index 4358e10..bcb180c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolumeChecker.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolumeChecker.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.ozone.container.common.volume;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -32,6 +31,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import com.google.common.util.concurrent.MoreExecutors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.DFSConfigKeysLegacy;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
@@ -45,6 +45,7 @@ import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.checkerframework.checker.nullness.qual.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -200,7 +201,8 @@ public class HddsVolumeChecker {
allVolumes.add(v);
Futures.addCallback(olf.get(),
new ResultHandler(v, healthyVolumes, failedVolumes,
- numVolumes, (ignored1, ignored2) -> latch.countDown()));
+ numVolumes, (ignored1, ignored2) -> latch.countDown()),
+ MoreExecutors.directExecutor());
} else {
if (numVolumes.decrementAndGet() == 0) {
latch.countDown();
@@ -305,24 +307,29 @@ public class HddsVolumeChecker {
}
@Override
- public void onSuccess(@Nonnull VolumeCheckResult result) {
- switch (result) {
- case HEALTHY:
- case DEGRADED:
- if (LOG.isDebugEnabled()) {
- LOG.debug("Volume {} is {}.", volume, result);
- }
- markHealthy();
- break;
- case FAILED:
- LOG.warn("Volume {} detected as being unhealthy", volume);
- markFailed();
- break;
- default:
- LOG.error("Unexpected health check result {} for volume {}",
- result, volume);
+ public void onSuccess(@Nullable VolumeCheckResult result) {
+ if (result == null) {
+ LOG.error("Unexpected empty health check result for volume {}", volume);
markHealthy();
- break;
+ } else {
+ switch (result) {
+ case HEALTHY:
+ case DEGRADED:
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Volume {} is {}.", volume, result);
+ }
+ markHealthy();
+ break;
+ case FAILED:
+ LOG.warn("Volume {} detected as being unhealthy", volume);
+ markFailed();
+ break;
+ default:
+ LOG.error("Unexpected health check result {} for volume {}", result,
+ volume);
+ markHealthy();
+ break;
+ }
}
cleanup();
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/ThrottledAsyncChecker.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/ThrottledAsyncChecker.java
index 836fdf3..6c6f724 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/ThrottledAsyncChecker.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/ThrottledAsyncChecker.java
@@ -28,11 +28,11 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hdfs.server.datanode.checker.Checkable;
import org.apache.hadoop.util.Timer;
+import org.checkerframework.checker.nullness.qual.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
@@ -181,7 +181,7 @@ public class ThrottledAsyncChecker<K, V> implements AsyncChecker<K, V> {
t, timer.monotonicNow()));
}
}
- });
+ }, MoreExecutors.directExecutor());
}
/**
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
index 54d7603..16bf406 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationSupervisor.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import javax.annotation.Nonnull;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static java.util.Collections.emptyList;
/**
@@ -115,7 +115,7 @@ public class TestReplicationSupervisor {
public void failureHandling() {
// GIVEN
ReplicationSupervisor supervisor = supervisorWith(
- __ -> throwingReplicator, sameThreadExecutor());
+ __ -> throwingReplicator, newDirectExecutorService());
try {
//WHEN
@@ -159,7 +159,7 @@ public class TestReplicationSupervisor {
private ReplicationSupervisor supervisorWithSuccessfulReplicator() {
return supervisorWith(supervisor -> new FakeReplicator(supervisor, set),
- sameThreadExecutor());
+ newDirectExecutorService());
}
private ReplicationSupervisor supervisorWith(
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 732bd9d..27e032d 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -61,7 +61,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>26.0-android</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git a/pom.xml b/pom.xml
index d641c39..4208a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<spotbugs.version>3.1.12</spotbugs.version>
<dnsjava.version>2.1.7</dnsjava.version>
- <guava.version>11.0.2</guava.version>
+ <guava.version>28.2-jre</guava.version>
<guice.version>4.0</guice.version>
<joda-time.version>2.9.9</joda-time.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org