Skip to content

Commit 54d80da

Browse files
committed
Fixed checkstyle issues.
1 parent d911d76 commit 54d80da

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/Handler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ public abstract Container importContainer(
125125
* Exports container to the output stream.
126126
*/
127127
public abstract void exportContainer(
128-
final Container container,
129-
final OutputStream outputStream,
130-
final TarContainerPacker packer)
128+
Container container,
129+
OutputStream outputStream,
130+
TarContainerPacker packer)
131131
throws IOException;
132132

133133
/**

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
2424
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
2525
import org.apache.hadoop.ozone.container.common.impl.TopNOrderedContainerDeletionChoosingPolicy;
26+
import org.apache.hadoop.ozone.container.common.interfaces.Container;
2627
import org.apache.hadoop.ozone.container.common.interfaces.ContainerDeletionChoosingPolicy;
2728
import org.apache.hadoop.ozone.container.common.transport.server.ratis.XceiverServerRatis;
2829
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
@@ -247,6 +248,9 @@ private class BlockDeletingTask
247248
@Override
248249
public BackgroundTaskResult call() throws Exception {
249250
ContainerBackgroundTaskResult crr = new ContainerBackgroundTaskResult();
251+
final Container container = ozoneContainer.getContainerSet()
252+
.getContainer(containerData.getContainerID());
253+
container.writeLock();
250254
long startTime = Time.monotonicNow();
251255
// Scan container's db and get list of under deletion blocks
252256
try (ReferenceCountedDB meta = BlockUtils.getDB(containerData, conf)) {
@@ -313,6 +317,8 @@ public BackgroundTaskResult call() throws Exception {
313317
}
314318
crr.addAll(succeedBlocks);
315319
return crr;
320+
} finally {
321+
container.writeUnlock();
316322
}
317323
}
318324

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ public void testContainerReplication() throws Exception {
124124
cluster.getStorageContainerManager().getScmNodeManager()
125125
.addDatanodeCommand(
126126
sourceDatanodes.get(0).getUuid(),
127-
new CloseContainerCommand(containerId, sourcePipelines.getId(), true));
127+
new CloseContainerCommand(containerId,
128+
sourcePipelines.getId(), true));
128129

129130
//WHEN: send the order to replicate the container
130131
cluster.getStorageContainerManager().getScmNodeManager()

0 commit comments

Comments
 (0)