From 3911045569e71f5e1ead455e651021136522e97b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 24 Nov 2020 11:24:58 +0100 Subject: [PATCH 1/3] HDDS-3363. Intermittent failure in testContainerImportExport --- .../hadoop/ozone/container/keyvalue/KeyValueContainer.java | 3 +++ .../hadoop/ozone/container/keyvalue/TestKeyValueContainer.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java index 1fff7494e87c..a239b5fbd8a5 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java @@ -528,6 +528,9 @@ public void exportContainerData(OutputStream destination, + getContainerData().getContainerID() + " is in state " + state); } compactDB(); + // Close DB (and remove from cache) to avoid concurrent modification while + // packing it. + BlockUtils.removeDB(containerData, config); packer.pack(this, destination); } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java index c2b487be2933..25d8b1d25edf 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java @@ -199,7 +199,6 @@ public void testContainerImportExport() throws Exception { metadataStore.getStore().getMetadataTable() .put(OzoneConsts.BLOCK_COUNT, numberOfKeysToWrite); } - BlockUtils.removeDB(keyValueContainerData, CONF); Map metadata = new HashMap<>(); metadata.put("key1", "value1"); From f99a7ff970348845fb9f02c9da3ef5157f20ff0e Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 24 Nov 2020 18:30:59 +0100 Subject: [PATCH 2/3] trigger new CI check From 0f0f73fa2a5f7d938e6c5606655d9f75ac6e78c5 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 24 Nov 2020 22:04:07 +0100 Subject: [PATCH 3/3] trigger new CI check