Skip to content

Minor fix to unit test #1930

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
absurdfarce merged 1 commit into from
Apr 23, 2024
Merged

Minor fix to unit test #1930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.datastax.oss.driver.internal.core.metadata.MetadataManager.RefreshSchemaResult;
import com.datastax.oss.driver.internal.core.metadata.NodeStateEvent;
import com.datastax.oss.driver.internal.core.metadata.NodeStateManager;
import com.datastax.oss.driver.internal.core.metrics.NodeMetricUpdater;
import com.datastax.oss.driver.internal.core.metrics.SessionMetricUpdater;
import com.datastax.oss.driver.internal.core.pool.ChannelPool;
import com.datastax.oss.driver.internal.core.util.Loggers;
Expand Down Expand Up @@ -549,10 +550,11 @@ private void close() {

// clear metrics to prevent memory leak
for (Node n : metadataManager.getMetadata().getNodes().values()) {
((DefaultNode) n).getMetricUpdater().clearMetrics();
NodeMetricUpdater updater = ((DefaultNode) n).getMetricUpdater();
if (updater != null) updater.clearMetrics();
}

DefaultSession.this.metricUpdater.clearMetrics();
if (metricUpdater != null) metricUpdater.clearMetrics();

List<CompletionStage<Void>> childrenCloseStages = new ArrayList<>();
for (AsyncAutoCloseable closeable : internalComponentsToClose()) {
Expand All @@ -575,10 +577,11 @@ private void forceClose() {

// clear metrics to prevent memory leak
for (Node n : metadataManager.getMetadata().getNodes().values()) {
((DefaultNode) n).getMetricUpdater().clearMetrics();
NodeMetricUpdater updater = ((DefaultNode) n).getMetricUpdater();
if (updater != null) updater.clearMetrics();
}

DefaultSession.this.metricUpdater.clearMetrics();
if (metricUpdater != null) metricUpdater.clearMetrics();

if (closeWasCalled) {
// onChildrenClosed has already been scheduled
Expand Down