You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2019/05/28 18:14:33 UTC
[hadoop] branch trunk updated: HDDS-1580. Obtain Handler reference
in ContainerScrubber (#842)
This is an automated email from the ASF dual-hosted git repository.
hanishakoneru pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new d1ec1c5 HDDS-1580. Obtain Handler reference in ContainerScrubber (#842)
d1ec1c5 is described below
commit d1ec1c52e5a8567526ac1ab6d8ab95010c49fddb
Author: Shweta Yakkali <sh...@cloudera.com>
AuthorDate: Tue May 28 11:14:24 2019 -0700
HDDS-1580. Obtain Handler reference in ContainerScrubber (#842)
---
.../ozone/container/ozoneimpl/ContainerController.java | 7 ++++++-
.../ozone/container/ozoneimpl/ContainerScrubber.java | 17 ++++++++---------
.../ozone/container/ozoneimpl/OzoneContainer.java | 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
index 3c0f251..11cb8ee 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.ozone.container.keyvalue.TarContainerPacker;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -132,7 +133,11 @@ public class ContainerController {
* @param container Container
* @return handler of the container
*/
- private Handler getHandler(final Container container) {
+ Handler getHandler(final Container container) {
return handlers.get(container.getContainerType());
}
+
+ Iterator<Container> getContainerSetIterator() {
+ return containerSet.getContainerIterator();
+ }
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScrubber.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScrubber.java
index dea7323..d6f8b27 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScrubber.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScrubber.java
@@ -18,12 +18,11 @@
package org.apache.hadoop.ozone.container.ozoneimpl;
-import com.google.common.base.Preconditions;
import org.apache.commons.net.ntp.TimeStamp;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
-import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
+import org.apache.hadoop.ozone.container.common.interfaces.Handler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,20 +35,19 @@ import java.util.Iterator;
public class ContainerScrubber implements Runnable {
private static final Logger LOG =
LoggerFactory.getLogger(ContainerScrubber.class);
- private final ContainerSet containerSet;
private final OzoneConfiguration config;
private final long timePerContainer = 10000; // 10 sec in millis
private boolean halt;
private Thread scrubThread;
+ private ContainerController controller;
- public ContainerScrubber(ContainerSet cSet, OzoneConfiguration conf) {
- Preconditions.checkNotNull(cSet,
- "ContainerScrubber received a null ContainerSet");
- Preconditions.checkNotNull(conf);
- this.containerSet = cSet;
+
+ public ContainerScrubber(OzoneConfiguration conf,
+ ContainerController controller) {
this.config = conf;
this.halt = false;
this.scrubThread = null;
+ this.controller = controller;
}
@Override public void run() {
@@ -130,12 +128,13 @@ public class ContainerScrubber implements Runnable {
private void scrub() {
- Iterator<Container> containerIt = containerSet.getContainerIterator();
+ Iterator<Container> containerIt = controller.getContainerSetIterator();
long count = 0;
while (containerIt.hasNext()) {
TimeStamp startTime = new TimeStamp(System.currentTimeMillis());
Container container = containerIt.next();
+ Handler containerHandler = controller.getHandler(container);
if (this.halt) {
break; // stop if requested
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
index f34334d..2254ec0 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
@@ -161,7 +161,7 @@ public class OzoneContainer {
HddsConfigKeys.HDDS_CONTAINERSCRUB_ENABLED);
} else {
if (this.scrubber == null) {
- this.scrubber = new ContainerScrubber(containerSet, config);
+ this.scrubber = new ContainerScrubber(config, controller);
}
scrubber.up();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org