You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2023/03/27 23:19:08 UTC
[ozone] branch master updated: HDDS-8272. DBStore not closed properly in ReconStorageContainerManagerFacade (#4469)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1ed9a73af0 HDDS-8272. DBStore not closed properly in ReconStorageContainerManagerFacade (#4469)
1ed9a73af0 is described below
commit 1ed9a73af020145a65dcae9df0feb506218f35a8
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Mar 28 01:19:00 2023 +0200
HDDS-8272. DBStore not closed properly in ReconStorageContainerManagerFacade (#4469)
---
.../recon/scm/ReconStorageContainerManagerFacade.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
index d0777efa39..d97f7eec6b 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
@@ -79,6 +79,7 @@ import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.hadoop.hdds.server.events.FixedThreadPoolWithAffinityExecutor;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
+import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
import org.apache.hadoop.hdds.utils.db.DBStore;
@@ -86,7 +87,6 @@ import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.Table.KeyValue;
import org.apache.hadoop.hdds.utils.db.TableIterator;
-import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.recon.ReconServerConfigKeys;
import org.apache.hadoop.ozone.recon.ReconUtils;
import org.apache.hadoop.ozone.recon.fsck.ContainerHealthTask;
@@ -426,11 +426,7 @@ public class ReconStorageContainerManagerFacade
IOUtils.cleanupWithLogger(LOG, pipelineManager);
LOG.info("Flushing container replica history to DB.");
containerManager.flushReplicaHistoryMapToDB(true);
- try {
- dbStore.close();
- } catch (Exception e) {
- LOG.error("Can't close dbStore ", e);
- }
+ IOUtils.close(LOG, dbStore);
}
@Override
@@ -604,8 +600,9 @@ public class ReconStorageContainerManagerFacade
ReconSCMDBDefinition.CONTAINERS.getTable(newStore));
nodeManager.reinitialize(
ReconSCMDBDefinition.NODES.getTable(newStore));
+ IOUtils.close(LOG, dbStore);
deleteOldSCMDB();
- setDbStore(newStore);
+ dbStore = newStore;
File newDb = new File(dbFile.getParent() +
OZONE_URI_DELIMITER + ReconSCMDBDefinition.RECON_SCM_DB_NAME);
boolean success = dbFile.renameTo(newDb);
@@ -636,10 +633,6 @@ public class ReconStorageContainerManagerFacade
return dbStoreBuilder.build();
}
- public void setDbStore(DBStore dbStore) {
- this.dbStore = dbStore;
- }
-
@Override
public NodeManager getScmNodeManager() {
return nodeManager;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org