diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2022-04-26 15:18:22 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2022-04-26 15:18:22 +0200 |
| commit | a0e48c544aae5b575a4735abc15c6a51e18f4661 (patch) | |
| tree | decdbb6b70331e93d7af40a503ce1caa6d58d639 | |
| parent | b9a8bc3aec3c7845ba7ca9a755b8339e0777763d (diff) | |
| download | mariadb-git-bb-10.9-MDEV-19281-v4.tar.gz | |
MDEV-28291: Post-review changesbb-10.9-MDEV-19281-v4
| -rw-r--r-- | plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_cache_timeout_update.result | 2 | ||||
| -rw-r--r-- | plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_cache_timeout_update.test | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_cache_timeout_update.result b/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_cache_timeout_update.result index cf3cd97d44b..a26b813a3e7 100644 --- a/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_cache_timeout_update.result +++ b/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_cache_timeout_update.result @@ -1,4 +1,3 @@ -# restart: with restart_parameters SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT, @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT; @@ -12,6 +11,7 @@ SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT; @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT 1 1 +SET GLOBAL HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT=0, HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT=180000; SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT, @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT; diff --git a/plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_cache_timeout_update.test b/plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_cache_timeout_update.test index f9f922df5ae..7d8b6fa493a 100644 --- a/plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_cache_timeout_update.test +++ b/plugin/hashicorp_key_management/mysql-test/vault/t/hashicorp_cache_timeout_update.test @@ -1,14 +1,8 @@ +# MDEV-28291: Cache variables claim to be dynamic but changes are ignored # The test presumes that the local vault is running at $VAULT_ADDR, # and the token is configured in $VAULT_TOKEN --source hashicorp_plugin.inc - ---exec vault secrets disable bug > /dev/null ---exec vault secrets enable -path /bug -version=2 kv > /dev/null ---exec vault kv put /bug/1 data=0123456789012345678901234567890A > /dev/null - ---let $restart_parameters=--plugin-load-add=hashicorp_key_management --hashicorp-key-management-vault-url="$VAULT_ADDR/v1/bug/" --hashicorp-key-management-token="$VAULT_TOKEN" ---let $restart_noprint=1 ---source include/restart_mysqld.inc +--source hashicorp_init.inc --let $ct=`SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT` --let $vt=`SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT` @@ -22,11 +16,9 @@ SET GLOBAL SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT, @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT; ---disable_query_log --eval SET GLOBAL HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT=$vt, HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT=$ct ---enable_query_log SELECT @@HASHICORP_KEY_MANAGEMENT_CACHE_VERSION_TIMEOUT, @@HASHICORP_KEY_MANAGEMENT_CACHE_TIMEOUT; ---exec vault secrets disable bug > /dev/null +--source hashicorp_deinit.inc |