From a05f9bbf220cb75af938619e7451efe03176ae5d Mon Sep 17 00:00:00 2001
From: guscarreon <guscarreon@gmail.com>
Date: Mon, 7 Nov 2022 17:30:22 -0500
Subject: [PATCH 1/4] Make Aerospike connection idle timeout configurable

---
 .swp                       | Bin 0 -> 12288 bytes
 backends/.aerospike.go.swp | Bin 0 -> 16384 bytes
 backends/aerospike.go      |   7 +++++++
 config/backends.go         |  31 +++++++++++++++++++------------
 config/backends_test.go    |  20 +++++++++++++++++++-
 config/config.go           |   1 +
 6 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 .swp
 create mode 100644 backends/.aerospike.go.swp

diff --git a/.swp b/.swp
new file mode 100644
index 0000000000000000000000000000000000000000..465ad6ef64f6ad84fdef8c41beed3b6c547d3e21
GIT binary patch
literal 12288
zcmeI%u};G<5C&iuCKf<tM+XduAyFGZv?F3-s9>P%ZhCF4CU&r$s%7B;VdqVlacC<_
zN0x&0TXHT=Y~T6YqVyV%w;gK5i3n}Ky3E_zM2KN3t!1N!rB@v8o|iAz;-t_~vk@g1
z?WlbfUAAI9%ad3Zh30AL;?(483owKL1U4YB(>+g`jVkfU@ev)=yBnwhDIov>2tWV=
z5P$##AOL|)3HYKWUPAJ%MFHE3SX+yWAp!&-009U<00Izz00bZa0SG_<0{>7z_J#P^
z72<F&6d(ToFTela!uU1x>Ull%_b>+y0uX=z1Rwwb2tWV=5P$##An?ZojAk+e@*}2e
zw#F4|%%_ghOtJP<m`tTJDx{S;d$x|0`<k1}sajon_xo+~GAGr~n7qo_l%590lBCpV
z&8ZJrVtN>bv_+X^WcjIN=N;v8%#Q9Y_f(&5WE$%ChI&l0S8Zjg^#e65Et8XB%KQjA
WoFNvX6Bd6TcO})&LY7-pTZ&J{Y>7_*

literal 0
HcmV?d00001

diff --git a/backends/.aerospike.go.swp b/backends/.aerospike.go.swp
new file mode 100644
index 0000000000000000000000000000000000000000..b6609ca30176b02616f1d93887051c7d5c37d86b
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/backends/aerospike.go b/backends/aerospike.go
index 9b37c4d4..03819b31 100644
--- a/backends/aerospike.go
+++ b/backends/aerospike.go
@@ -3,6 +3,7 @@ package backends
 import (
 	"context"
 	"errors"
+	"time"
 
 	as "github.com/aerospike/aerospike-client-go/v6"
 	as_types "github.com/aerospike/aerospike-client-go/v6/types"
@@ -61,6 +62,12 @@ func NewAerospikeBackend(cfg config.Aerospike, metrics *metrics.Metrics) *Aerosp
 	clientPolicy.User = cfg.User
 	clientPolicy.Password = cfg.Password
 
+	// Aerospike's connection idle deadline default is 55 seconds. If greater than zero, this
+	// value will override
+	if cfg.ConnectionIdleTimeout > 0 {
+		clientPolicy.IdleTimeout = time.Duration(cfg.ConnectionIdleTimeout) * time.Second
+	}
+
 	if len(cfg.Host) > 1 {
 		hosts = append(hosts, as.NewHost(cfg.Host, cfg.Port))
 		log.Info("config.backend.aerospike.host is being deprecated in favor of config.backend.aerospike.hosts")
diff --git a/config/backends.go b/config/backends.go
index b7969029..79985b97 100644
--- a/config/backends.go
+++ b/config/backends.go
@@ -45,15 +45,16 @@ const (
 )
 
 type Aerospike struct {
-	DefaultTTL      int      `mapstructure:"default_ttl_seconds"`
-	Host            string   `mapstructure:"host"`
-	Hosts           []string `mapstructure:"hosts"`
-	Port            int      `mapstructure:"port"`
-	Namespace       string   `mapstructure:"namespace"`
-	User            string   `mapstructure:"user"`
-	Password        string   `mapstructure:"password"`
-	MaxReadRetries  int      `mapstructure:"max_read_retries"`
-	MaxWriteRetries int      `mapstructure:"max_write_retries"`
+	DefaultTTL            int      `mapstructure:"default_ttl_seconds"`
+	Host                  string   `mapstructure:"host"`
+	Hosts                 []string `mapstructure:"hosts"`
+	Port                  int      `mapstructure:"port"`
+	Namespace             string   `mapstructure:"namespace"`
+	User                  string   `mapstructure:"user"`
+	Password              string   `mapstructure:"password"`
+	MaxReadRetries        int      `mapstructure:"max_read_retries"`
+	MaxWriteRetries       int      `mapstructure:"max_write_retries"`
+	ConnectionIdleTimeout int      `mapstructure:"connection_idle_timeout"`
 }
 
 func (cfg *Aerospike) validateAndLog() error {
@@ -64,15 +65,21 @@ func (cfg *Aerospike) validateAndLog() error {
 	if cfg.Port <= 0 {
 		return fmt.Errorf("Cannot connect to Aerospike host at port %d", cfg.Port)
 	}
-	if cfg.DefaultTTL > 0 {
-		log.Infof("config.backend.aerospike.default_ttl_seconds: %d. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", cfg.DefaultTTL)
-	}
+
 	log.Infof("config.backend.aerospike.host: %s", cfg.Host)
 	log.Infof("config.backend.aerospike.hosts: %v", cfg.Hosts)
 	log.Infof("config.backend.aerospike.port: %d", cfg.Port)
 	log.Infof("config.backend.aerospike.namespace: %s", cfg.Namespace)
 	log.Infof("config.backend.aerospike.user: %s", cfg.User)
 
+	if cfg.DefaultTTL > 0 {
+		log.Infof("config.backend.aerospike.default_ttl_seconds: %d. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", cfg.DefaultTTL)
+	}
+
+	if cfg.ConnectionIdleTimeout > 0 {
+		log.Infof("config.backend.aerospike.connection_idle_timeout: %d. Will substitute Aerospike's default 55 seconds.", cfg.ConnectionIdleTimeout)
+	}
+
 	if cfg.MaxReadRetries < 2 {
 		log.Infof("config.backend.aerospike.max_read_retries value will default to 2")
 		cfg.MaxReadRetries = 2
diff --git a/config/backends_test.go b/config/backends_test.go
index 57c1b3ba..bdb26dd2 100644
--- a/config/backends_test.go
+++ b/config/backends_test.go
@@ -107,12 +107,12 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 					},
 					hasError: false,
 					logEntries: []logComponents{
-						{msg: "config.backend.aerospike.default_ttl_seconds: 3600. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.host: foo.com", lvl: logrus.InfoLevel},
 						{msg: fmt.Sprintf("config.backend.aerospike.hosts: %v", []string{"foo.com", "bat.com"}), lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.port: 8888", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.namespace: ", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.user: ", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.default_ttl_seconds: 3600. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.max_read_retries value will default to 2", lvl: logrus.InfoLevel},
 					},
 				},
@@ -186,6 +186,24 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 						{msg: "config.backend.aerospike.max_write_retries: 1.", lvl: logrus.InfoLevel},
 					},
 				},
+				{
+					desc: "aerospike.connection_idle_timeout value found in config",
+					inCfg: Aerospike{
+						Host:                  "foo.com",
+						Port:                  8888,
+						ConnectionIdleTimeout: 1,
+					},
+					hasError: false,
+					logEntries: []logComponents{
+						{msg: "config.backend.aerospike.host: foo.com", lvl: logrus.InfoLevel},
+						{msg: fmt.Sprintf("config.backend.aerospike.hosts: %v", []string{}), lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.port: 8888", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.namespace: ", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.user: ", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.connection_idle_timeout: 1. Will substitute Aerospike's default 55 seconds.", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.max_read_retries value will default to 2", lvl: logrus.InfoLevel},
+					},
+				},
 			},
 		},
 		{
diff --git a/config/config.go b/config/config.go
index 9ac095e2..69ac5d46 100644
--- a/config/config.go
+++ b/config/config.go
@@ -55,6 +55,7 @@ func setConfigDefaults(v *viper.Viper) {
 	v.SetDefault("backend.aerospike.default_ttl_seconds", 0)
 	v.SetDefault("backend.aerospike.max_read_retries", 2)
 	v.SetDefault("backend.aerospike.max_write_retries", 0)
+	v.SetDefault("backend.aerospike.connection_idle_timeout", 0)
 	v.SetDefault("backend.cassandra.hosts", "")
 	v.SetDefault("backend.cassandra.keyspace", "")
 	v.SetDefault("backend.cassandra.default_ttl_seconds", utils.CASSANDRA_DEFAULT_TTL_SECONDS)

From ffa103b1fb08e43e4be0889fe2e9033df678ce39 Mon Sep 17 00:00:00 2001
From: guscarreon <guscarreon@gmail.com>
Date: Mon, 7 Nov 2022 17:47:41 -0500
Subject: [PATCH 2/4] Removed vim's .swp files

---
 .swp                       | Bin 12288 -> 0 bytes
 backends/.aerospike.go.swp | Bin 16384 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .swp
 delete mode 100644 backends/.aerospike.go.swp

diff --git a/.swp b/.swp
deleted file mode 100644
index 465ad6ef64f6ad84fdef8c41beed3b6c547d3e21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI%u};G<5C&iuCKf<tM+XduAyFGZv?F3-s9>P%ZhCF4CU&r$s%7B;VdqVlacC<_
zN0x&0TXHT=Y~T6YqVyV%w;gK5i3n}Ky3E_zM2KN3t!1N!rB@v8o|iAz;-t_~vk@g1
z?WlbfUAAI9%ad3Zh30AL;?(483owKL1U4YB(>+g`jVkfU@ev)=yBnwhDIov>2tWV=
z5P$##AOL|)3HYKWUPAJ%MFHE3SX+yWAp!&-009U<00Izz00bZa0SG_<0{>7z_J#P^
z72<F&6d(ToFTela!uU1x>Ull%_b>+y0uX=z1Rwwb2tWV=5P$##An?ZojAk+e@*}2e
zw#F4|%%_ghOtJP<m`tTJDx{S;d$x|0`<k1}sajon_xo+~GAGr~n7qo_l%590lBCpV
z&8ZJrVtN>bv_+X^WcjIN=N;v8%#Q9Y_f(&5WE$%ChI&l0S8Zjg^#e65Et8XB%KQjA
WoFNvX6Bd6TcO})&LY7-pTZ&J{Y>7_*

diff --git a/backends/.aerospike.go.swp b/backends/.aerospike.go.swp
deleted file mode 100644
index b6609ca30176b02616f1d93887051c7d5c37d86b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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


From 4ee257d8f57260a0a54017477f4e3be464f1eff5 Mon Sep 17 00:00:00 2001
From: guscarreon <guscarreon@gmail.com>
Date: Tue, 8 Nov 2022 14:43:48 -0500
Subject: [PATCH 3/4] Mansi's review

---
 config/backends.go      | 27 ++++++++++++++++-----------
 config/backends_test.go |  4 ++--
 config/config.go        |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/config/backends.go b/config/backends.go
index 79985b97..a137d9b8 100644
--- a/config/backends.go
+++ b/config/backends.go
@@ -45,16 +45,21 @@ const (
 )
 
 type Aerospike struct {
-	DefaultTTL            int      `mapstructure:"default_ttl_seconds"`
-	Host                  string   `mapstructure:"host"`
-	Hosts                 []string `mapstructure:"hosts"`
-	Port                  int      `mapstructure:"port"`
-	Namespace             string   `mapstructure:"namespace"`
-	User                  string   `mapstructure:"user"`
-	Password              string   `mapstructure:"password"`
-	MaxReadRetries        int      `mapstructure:"max_read_retries"`
-	MaxWriteRetries       int      `mapstructure:"max_write_retries"`
-	ConnectionIdleTimeout int      `mapstructure:"connection_idle_timeout"`
+	DefaultTTL      int      `mapstructure:"default_ttl_seconds"`
+	Host            string   `mapstructure:"host"`
+	Hosts           []string `mapstructure:"hosts"`
+	Port            int      `mapstructure:"port"`
+	Namespace       string   `mapstructure:"namespace"`
+	User            string   `mapstructure:"user"`
+	Password        string   `mapstructure:"password"`
+	MaxReadRetries  int      `mapstructure:"max_read_retries"`
+	MaxWriteRetries int      `mapstructure:"max_write_retries"`
+	// Please set this to a value lower than the `proto-fd-idle-ms` (converted
+	// to seconds) value set in your Aerospike Server. This is to avoid having
+	// race conditions where the server closes the connection but the client still
+	// tries to use it. If set to a value less than or equal to 0, Aerospike
+	// Client's default value will be used which is 55 seconds.
+	ConnectionIdleTimeout int `mapstructure:"connection_idle_timeout_seconds"`
 }
 
 func (cfg *Aerospike) validateAndLog() error {
@@ -77,7 +82,7 @@ func (cfg *Aerospike) validateAndLog() error {
 	}
 
 	if cfg.ConnectionIdleTimeout > 0 {
-		log.Infof("config.backend.aerospike.connection_idle_timeout: %d. Will substitute Aerospike's default 55 seconds.", cfg.ConnectionIdleTimeout)
+		log.Infof("config.backend.aerospike.connection_idle_timeout_seconds: %d.", cfg.ConnectionIdleTimeout)
 	}
 
 	if cfg.MaxReadRetries < 2 {
diff --git a/config/backends_test.go b/config/backends_test.go
index bdb26dd2..0646b5e9 100644
--- a/config/backends_test.go
+++ b/config/backends_test.go
@@ -187,7 +187,7 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 					},
 				},
 				{
-					desc: "aerospike.connection_idle_timeout value found in config",
+					desc: "aerospike.connection_idle_timeout_seconds value found in config",
 					inCfg: Aerospike{
 						Host:                  "foo.com",
 						Port:                  8888,
@@ -200,7 +200,7 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 						{msg: "config.backend.aerospike.port: 8888", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.namespace: ", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.user: ", lvl: logrus.InfoLevel},
-						{msg: "config.backend.aerospike.connection_idle_timeout: 1. Will substitute Aerospike's default 55 seconds.", lvl: logrus.InfoLevel},
+						{msg: "config.backend.aerospike.connection_idle_timeout_seconds: 1.", lvl: logrus.InfoLevel},
 						{msg: "config.backend.aerospike.max_read_retries value will default to 2", lvl: logrus.InfoLevel},
 					},
 				},
diff --git a/config/config.go b/config/config.go
index 69ac5d46..95d64a76 100644
--- a/config/config.go
+++ b/config/config.go
@@ -55,7 +55,7 @@ func setConfigDefaults(v *viper.Viper) {
 	v.SetDefault("backend.aerospike.default_ttl_seconds", 0)
 	v.SetDefault("backend.aerospike.max_read_retries", 2)
 	v.SetDefault("backend.aerospike.max_write_retries", 0)
-	v.SetDefault("backend.aerospike.connection_idle_timeout", 0)
+	v.SetDefault("backend.aerospike.connection_idle_timeout_seconds", 0)
 	v.SetDefault("backend.cassandra.hosts", "")
 	v.SetDefault("backend.cassandra.keyspace", "")
 	v.SetDefault("backend.cassandra.default_ttl_seconds", utils.CASSANDRA_DEFAULT_TTL_SECONDS)

From 97b500678f655d86954cbafbe22d770d75bf0806 Mon Sep 17 00:00:00 2001
From: guscarreon <guscarreon@gmail.com>
Date: Wed, 9 Nov 2022 14:39:28 -0500
Subject: [PATCH 4/4] Renamed to DefaultTTLSecs and ConnIdleTimeoutSecs

---
 backends/aerospike.go                     |  4 ++--
 backends/config/config.go                 |  4 ++--
 backends/config/config_test.go            |  6 +++---
 config/backends.go                        | 12 ++++++------
 config/backends_test.go                   | 14 +++++++-------
 config/config_test.go                     | 17 +++++++++--------
 config/configtest/sample_full_config.yaml |  1 +
 7 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/backends/aerospike.go b/backends/aerospike.go
index 03819b31..00468459 100644
--- a/backends/aerospike.go
+++ b/backends/aerospike.go
@@ -64,8 +64,8 @@ func NewAerospikeBackend(cfg config.Aerospike, metrics *metrics.Metrics) *Aerosp
 
 	// Aerospike's connection idle deadline default is 55 seconds. If greater than zero, this
 	// value will override
-	if cfg.ConnectionIdleTimeout > 0 {
-		clientPolicy.IdleTimeout = time.Duration(cfg.ConnectionIdleTimeout) * time.Second
+	if cfg.ConnIdleTimeoutSecs > 0 {
+		clientPolicy.IdleTimeout = time.Duration(cfg.ConnIdleTimeoutSecs) * time.Second
 	}
 
 	if len(cfg.Host) > 1 {
diff --git a/backends/config/config.go b/backends/config/config.go
index 7d9cf47d..8bcf20bd 100644
--- a/backends/config/config.go
+++ b/backends/config/config.go
@@ -84,8 +84,8 @@ func getMaxTTLSeconds(cfg config.Configuration) int {
 	case config.BackendAerospike:
 		// If both config.request_limits.max_ttl_seconds and config.backend.aerospike.default_ttl_seconds
 		// were defined, the smallest value takes preference
-		if cfg.Backend.Aerospike.DefaultTTL > 0 && maxTTLSeconds > cfg.Backend.Aerospike.DefaultTTL {
-			maxTTLSeconds = cfg.Backend.Aerospike.DefaultTTL
+		if cfg.Backend.Aerospike.DefaultTTLSecs > 0 && maxTTLSeconds > cfg.Backend.Aerospike.DefaultTTLSecs {
+			maxTTLSeconds = cfg.Backend.Aerospike.DefaultTTLSecs
 		}
 	case config.BackendRedis:
 		// If both config.request_limits.max_ttl_seconds and backend.redis.expiration
diff --git a/backends/config/config_test.go b/backends/config/config_test.go
index bab2f919..e058bb7a 100644
--- a/backends/config/config_test.go
+++ b/backends/config/config_test.go
@@ -233,7 +233,7 @@ func TestGetMaxTTLSeconds(t *testing.T) {
 						Backend: config.Backend{
 							Type: config.BackendAerospike,
 							Aerospike: config.Aerospike{
-								DefaultTTL: 0,
+								DefaultTTLSecs: 0,
 							},
 						},
 						RequestLimits: config.RequestLimits{
@@ -248,7 +248,7 @@ func TestGetMaxTTLSeconds(t *testing.T) {
 						Backend: config.Backend{
 							Type: config.BackendAerospike,
 							Aerospike: config.Aerospike{
-								DefaultTTL: 100,
+								DefaultTTLSecs: 100,
 							},
 						},
 						RequestLimits: config.RequestLimits{
@@ -263,7 +263,7 @@ func TestGetMaxTTLSeconds(t *testing.T) {
 						Backend: config.Backend{
 							Type: config.BackendAerospike,
 							Aerospike: config.Aerospike{
-								DefaultTTL: 1,
+								DefaultTTLSecs: 1,
 							},
 						},
 						RequestLimits: config.RequestLimits{
diff --git a/config/backends.go b/config/backends.go
index a137d9b8..93718976 100644
--- a/config/backends.go
+++ b/config/backends.go
@@ -45,7 +45,7 @@ const (
 )
 
 type Aerospike struct {
-	DefaultTTL      int      `mapstructure:"default_ttl_seconds"`
+	DefaultTTLSecs  int      `mapstructure:"default_ttl_seconds"`
 	Host            string   `mapstructure:"host"`
 	Hosts           []string `mapstructure:"hosts"`
 	Port            int      `mapstructure:"port"`
@@ -59,7 +59,7 @@ type Aerospike struct {
 	// race conditions where the server closes the connection but the client still
 	// tries to use it. If set to a value less than or equal to 0, Aerospike
 	// Client's default value will be used which is 55 seconds.
-	ConnectionIdleTimeout int `mapstructure:"connection_idle_timeout_seconds"`
+	ConnIdleTimeoutSecs int `mapstructure:"connection_idle_timeout_seconds"`
 }
 
 func (cfg *Aerospike) validateAndLog() error {
@@ -77,12 +77,12 @@ func (cfg *Aerospike) validateAndLog() error {
 	log.Infof("config.backend.aerospike.namespace: %s", cfg.Namespace)
 	log.Infof("config.backend.aerospike.user: %s", cfg.User)
 
-	if cfg.DefaultTTL > 0 {
-		log.Infof("config.backend.aerospike.default_ttl_seconds: %d. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", cfg.DefaultTTL)
+	if cfg.DefaultTTLSecs > 0 {
+		log.Infof("config.backend.aerospike.default_ttl_seconds: %d. Note that this configuration option is being deprecated in favor of config.request_limits.max_ttl_seconds", cfg.DefaultTTLSecs)
 	}
 
-	if cfg.ConnectionIdleTimeout > 0 {
-		log.Infof("config.backend.aerospike.connection_idle_timeout_seconds: %d.", cfg.ConnectionIdleTimeout)
+	if cfg.ConnIdleTimeoutSecs > 0 {
+		log.Infof("config.backend.aerospike.connection_idle_timeout_seconds: %d.", cfg.ConnIdleTimeoutSecs)
 	}
 
 	if cfg.MaxReadRetries < 2 {
diff --git a/config/backends_test.go b/config/backends_test.go
index 0646b5e9..fe8b4bf4 100644
--- a/config/backends_test.go
+++ b/config/backends_test.go
@@ -100,10 +100,10 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 				{
 					desc: "both aerospike.host, aerospike.hosts and aerospike.default_ttl_seconds set",
 					inCfg: Aerospike{
-						Host:       "foo.com",
-						Hosts:      []string{"foo.com", "bat.com"},
-						Port:       8888,
-						DefaultTTL: 3600,
+						Host:           "foo.com",
+						Hosts:          []string{"foo.com", "bat.com"},
+						Port:           8888,
+						DefaultTTLSecs: 3600,
 					},
 					hasError: false,
 					logEntries: []logComponents{
@@ -189,9 +189,9 @@ func TestAerospikeValidateAndLog(t *testing.T) {
 				{
 					desc: "aerospike.connection_idle_timeout_seconds value found in config",
 					inCfg: Aerospike{
-						Host:                  "foo.com",
-						Port:                  8888,
-						ConnectionIdleTimeout: 1,
+						Host:                "foo.com",
+						Port:                8888,
+						ConnIdleTimeoutSecs: 1,
 					},
 					hasError: false,
 					logEntries: []logComponents{
diff --git a/config/config_test.go b/config/config_test.go
index d8b9c77f..28578b68 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1245,14 +1245,15 @@ func getExpectedFullConfigForTestFile() Configuration {
 		Backend: Backend{
 			Type: BackendMemory,
 			Aerospike: Aerospike{
-				DefaultTTL:     3600,
-				Host:           "aerospike.prebid.com",
-				Hosts:          []string{"aerospike2.prebid.com", "aerospike3.prebid.com"},
-				Port:           3000,
-				Namespace:      "whatever",
-				User:           "foo",
-				Password:       "bar",
-				MaxReadRetries: 2,
+				DefaultTTLSecs:      3600,
+				Host:                "aerospike.prebid.com",
+				Hosts:               []string{"aerospike2.prebid.com", "aerospike3.prebid.com"},
+				Port:                3000,
+				Namespace:           "whatever",
+				User:                "foo",
+				Password:            "bar",
+				MaxReadRetries:      2,
+				ConnIdleTimeoutSecs: 2,
 			},
 			Cassandra: Cassandra{
 				Hosts:      "127.0.0.1",
diff --git a/config/configtest/sample_full_config.yaml b/config/configtest/sample_full_config.yaml
index 0f1454ee..6c298d59 100644
--- a/config/configtest/sample_full_config.yaml
+++ b/config/configtest/sample_full_config.yaml
@@ -21,6 +21,7 @@ backend:
     namespace: "whatever"
     user: "foo"
     password: "bar"
+    connection_idle_timeout_seconds: 2
   cassandra:
     hosts: "127.0.0.1"
     keyspace: "prebid"