Skip to content

HDDS-1580.Obtain Handler reference in ContainerScrubber #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2019
Merged

HDDS-1580.Obtain Handler reference in ContainerScrubber #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...ervice/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;

/**
Expand Down Expand Up @@ -132,7 +133,11 @@ public void deleteContainer(final long containerId, boolean force)
* @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();
}
}
17 changes: 8 additions & 9 deletions ...-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScrubber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -36,20 +35,19 @@
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() {
Expand Down Expand Up @@ -130,12 +128,13 @@ private void throttleScrubber(TimeStamp startTime) {

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
Expand Down
2 changes: 1 addition & 1 deletion ...ner-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void startContainerScrub() {
HddsConfigKeys.HDDS_CONTAINERSCRUB_ENABLED);
} else {
if (this.scrubber == null) {
this.scrubber = new ContainerScrubber(containerSet, config);
this.scrubber = new ContainerScrubber(config, controller);
}
scrubber.up();
}
Expand Down