Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.external.utils.MySqlErrorUtils;
import com.external.utils.QueryUtils;
import io.r2dbc.pool.ConnectionPool;
import io.r2dbc.pool.PoolMetrics;
import io.r2dbc.spi.Connection;
import io.r2dbc.spi.R2dbcBadGrammarException;
import io.r2dbc.spi.R2dbcException;
Expand Down Expand Up @@ -63,18 +64,8 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.TimeoutException;
import java.util.stream.IntStream;

Expand Down Expand Up @@ -378,6 +369,21 @@ isConnectionValid && isSSHTunnelConnected(sshTunnelContext))
});
}

// Adding connection pool logs in order to debug memroy leak issue
// Refer: https://github.com/appsmithorg/appsmith/issues/34028
Optional<PoolMetrics> poolMetricsOptional = connectionPool.getMetrics();
if (poolMetricsOptional.isPresent()) {
PoolMetrics poolMetrics = poolMetricsOptional.get();
log.info(
"Execute query: connection Pool Metrics: Acquired {}, Pending: {}, Allocated: {}, idle: {}, Max allocations: {}, Max pending acquire: {}",
poolMetrics.acquiredSize(),
poolMetrics.pendingAcquireSize(),
poolMetrics.allocatedSize(),
poolMetrics.idleSize(),
poolMetrics.getMaxAllocatedSize(),
poolMetrics.getMaxPendingAcquireSize());
}

return resultMono
.map(res -> {
ActionExecutionResult result = new ActionExecutionResult();
Expand Down Expand Up @@ -723,6 +729,20 @@ public Mono<DatasourceStructure> getStructure(
.map(isConnectionValid ->
isConnectionValid && isSSHTunnelConnected(sshTunnelContext))
.flatMapMany(isValid -> {
// Adding connection pool logs in order to debug memroy leak issue
// Refer: https://github.com/appsmithorg/appsmith/issues/34028
Optional<PoolMetrics> poolMetricsOptional = connectionPool.getMetrics();
if (poolMetricsOptional.isPresent()) {
PoolMetrics poolMetrics = poolMetricsOptional.get();
log.info(
"Get structure: connection Pool Metrics: Acquired {}, Pending: {}, Allocated: {}, idle: {}, Max allocations: {}, Max pending acquire: {}",
poolMetrics.acquiredSize(),
poolMetrics.pendingAcquireSize(),
poolMetrics.allocatedSize(),
poolMetrics.idleSize(),
poolMetrics.getMaxAllocatedSize(),
poolMetrics.getMaxPendingAcquireSize());
}
if (isValid) {
return connection
.createStatement(COLUMNS_QUERY)
Expand Down