This is an automated email from the ASF dual-hosted git repository.
ajay pushed a commit to branch ozone-0.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4 by this push:
new 6fd95b8 HDDS-1296. Fix checkstyle issue from Nightly run. Contributed
by Xiaoyu Yao. (#616)
6fd95b8 is described below
commit 6fd95b8595963bf5b30ef0170a83c33571d9845a
Author: Xiaoyu Yao <x...@apache.org>
AuthorDate: Mon Mar 18 08:38:55 2019 -0700
HDDS-1296. Fix checkstyle issue from Nightly run. Contributed by Xiaoyu
Yao. (#616)
(cherry picked from commit 66a104bc57242b2817e8c1f67cb6776e70cf5c47)
---
.../java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java | 1 +
.../src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java | 6 ++----
.../src/main/java/org/apache/hadoop/ozone/om/ScmClient.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
index bbd1157..5011d3b 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyLocationInfo.java
@@ -123,6 +123,7 @@ public final class OmKeyLocationInfo {
return this;
}
+ @SuppressWarnings("checkstyle:hiddenfield")
public Builder setPipeline(Pipeline pipeline) {
this.pipeline = pipeline;
return this;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 38d0922..187509f 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -96,8 +96,6 @@ import static org.apache.hadoop.util.Time.monotonicNow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.HEAD;
-
/**
* Implementation of keyManager.
*/
@@ -163,8 +161,8 @@ public class KeyManagerImpl implements KeyManager {
OZONE_BLOCK_DELETING_SERVICE_TIMEOUT,
OZONE_BLOCK_DELETING_SERVICE_TIMEOUT_DEFAULT,
TimeUnit.MILLISECONDS);
- keyDeletingService = new KeyDeletingService(scmClient.getBlockClient(),
this,
- blockDeleteInterval, serviceTimeout, configuration);
+ keyDeletingService = new KeyDeletingService(scmClient.getBlockClient(),
+ this, blockDeleteInterval, serviceTimeout, configuration);
keyDeletingService.start();
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
index 73a0cf9..2a732c7 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
@@ -35,7 +35,7 @@ public class ScmClient {
}
ScmBlockLocationProtocol getBlockClient() {
- return this.blockClient;
+ return this.blockClient;
}
StorageContainerLocationProtocol getContainerClient() {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
