Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-377. Make the ScmClient closable and stop the started threads. Contributed by Elek Marton.

This commit is contained in:
Xiaoyu Yao 2018-08-27 08:19:05 -07:00
parent 84973d1049
commit 6eecd251d8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/ContainerOperationClient.java
View File

@ -257,6 +257,15 @@ public class ContainerOperationClient implements ScmClient {
factor, nodePool);
}
@Override
public void close() {
try {
xceiverClientManager.close();
} catch (Exception ex) {
LOG.error("Can't close " + this.getClass().getSimpleName(), ex);
}
}
/**
* Deletes an existing container.
*

9
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
View File

@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
.ContainerData;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import java.io.Closeable;
import java.io.IOException;
import java.util.List;
@ -39,7 +40,7 @@ import java.util.List;
* this interface will likely be removed.
*/
@InterfaceStability.Unstable
public interface ScmClient {
public interface ScmClient extends Closeable {
/**
* Creates a Container on SCM and returns the pipeline.
* @return ContainerInfo
@ -61,7 +62,8 @@ public interface ScmClient {
* @return ContainerWithPipeline
* @throws IOException
*/
ContainerWithPipeline getContainerWithPipeline(long containerId) throws IOException;
ContainerWithPipeline getContainerWithPipeline(long containerId)
throws IOException;
/**
* Close a container.
@ -87,7 +89,8 @@ public interface ScmClient {
* @param force - true to forcibly delete the container.
* @throws IOException
*/
void deleteContainer(long containerId, Pipeline pipeline, boolean force) throws IOException;
void deleteContainer(long containerId, Pipeline pipeline, boolean force)
throws IOException;
/**
* Deletes an existing container.