Skip to content

HDDS-14766. Close ReconfigurationHandler #9870

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
adoroszlai merged 2 commits into from
Mar 6, 2026
Merged

HDDS-14766. Close ReconfigurationHandler #9870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3b3f95
HDDS-14766. Close ReconfigurationHandler
ivandika3 Mar 6, 2026
2dc5b6b
Address comment
ivandika3 Mar 6, 2026
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
2 changes: 2 additions & 0 deletions hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
import org.apache.hadoop.hdds.utils.HddsVersionInfo;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.ozone.container.common.DatanodeLayoutStorage;
import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils;
Expand Down Expand Up @@ -579,6 +580,7 @@ public void stop() {
}
}
}
IOUtils.close(LOG, reconfigurationHandler);
if (datanodeStateMachine != null) {
datanodeStateMachine.stopDaemon();
}
Expand Down
4 changes: 1 addition & 3 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/ReconfigurationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,7 @@ public ReconfigurationTaskStatus getReconfigureStatus() throws IOException {
@Override
public List<String> listReconfigureProperties() throws IOException {
requireAdminPrivilege.accept("listReconfigurableProperties");
Set<String> reconfigureProperties = new TreeSet<>(getReconfigurableProperties());
reconfigureProperties.addAll(prefixProperties);
return new ArrayList<>(reconfigureProperties);
return new ArrayList<>(new TreeSet<>(getReconfigurableProperties()));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ private void persistSCMCertificates() throws IOException {
public void stop() {
if (isStopped.getAndSet(true)) {
LOG.info("Storage Container Manager is not running.");
IOUtils.close(LOG, scmHAManager);
IOUtils.close(LOG, reconfigurationHandler, scmHAManager);
stopReplicationManager(); // started eagerly
return;
}
Expand Down
2 changes: 2 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
import org.apache.hadoop.hdds.server.http.RatisDropwizardExports;
import org.apache.hadoop.hdds.utils.HAUtils;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource;
import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
import org.apache.hadoop.hdds.utils.TransactionInfo;
Expand Down Expand Up @@ -2379,6 +2380,7 @@ public boolean stop() {
}
try {
omState = State.STOPPED;
IOUtils.close(LOG, reconfigurationHandler);
// Cancel the metrics timer and set to null.
if (metricsTimer != null) {
metricsTimer.cancel();
Expand Down