mirror of
https://github.com/EchoVault/SugarDB.git
synced 2026-04-22 23:47:09 +08:00
KeyExists keyspace function now removes the key if the key expiry is in the past.
KeyData type moved to utils package to allow sharing between multiple packages. Updated all commands and command tests to pass context object to KeyExists, KeyLock, keyUnlock, KeyRLock, and KeyRUnlock. Create context object for each test in all test suites instead of just passing context.Background() to all functions that accept a context.
This commit is contained in:
Kelvin Mwinuka
+213
-213
@@ -47,216 +47,216 @@ services:
|
||||
networks:
|
||||
- testnet
|
||||
|
||||
cluster_node_1:
|
||||
container_name: cluster_node_1
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
environment:
|
||||
- PORT=7480
|
||||
- RAFT_PORT=8000
|
||||
- ML_PORT=7946
|
||||
- KEY=/generic/ssl/certs/echovault/server1.key
|
||||
- CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
- SERVER_ID=1
|
||||
- DATA_DIR=/var/lib/echovault
|
||||
- IN_MEMORY=false
|
||||
- TLS=false
|
||||
- MTLS=false
|
||||
- BOOTSTRAP_CLUSTER=true
|
||||
- ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
- REQUIRE_PASS=false
|
||||
- FORWARD_COMMAND=true
|
||||
- SNAPSHOT_THRESHOLD=1000
|
||||
- SNAPSHOT_INTERVAL=5m30s
|
||||
- RESTORE_SNAPSHOT=false
|
||||
- RESTORE_AOF=false
|
||||
- AOF_SYNC_STRATEGY=everysec
|
||||
- MAX_MEMORY=2000kb
|
||||
- EVICTION_POLICY=allkeys-lfu
|
||||
# List of server cert/key pairs
|
||||
- CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
- CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# List of client certificate authorities
|
||||
- CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
ports:
|
||||
- "7481:7480"
|
||||
- "7945:7946"
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
- ./volumes/cluster_node_1:/var/lib/echovault
|
||||
networks:
|
||||
- testnet
|
||||
|
||||
cluster_node_2:
|
||||
container_name: cluster_node_2
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
environment:
|
||||
- PORT=7480
|
||||
- RAFT_PORT=8000
|
||||
- ML_PORT=7946
|
||||
- KEY=/generic/ssl/certs/echovault/server1.key
|
||||
- CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
- SERVER_ID=2
|
||||
- JOIN_ADDR=cluster_node_1:7946
|
||||
- DATA_DIR=/var/lib/echovault
|
||||
- IN_MEMORY=false
|
||||
- TLS=false
|
||||
- MTLS=false
|
||||
- BOOTSTRAP_CLUSTER=false
|
||||
- ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
- REQUIRE_PASS=false
|
||||
- FORWARD_COMMAND=true
|
||||
- SNAPSHOT_THRESHOLD=1000
|
||||
- SNAPSHOT_INTERVAL=5m30s
|
||||
- RESTORE_SNAPSHOT=false
|
||||
- RESTORE_AOF=false
|
||||
- AOF_SYNC_STRATEGY=everysec
|
||||
- MAX_MEMORY=2000kb
|
||||
- EVICTION_POLICY=allkeys-lfu
|
||||
# List of server cert/key pairs
|
||||
- CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
- CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# List of client certificate authorities
|
||||
- CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
ports:
|
||||
- "7482:7480"
|
||||
- "7947:7946"
|
||||
- "8001:8000"
|
||||
volumes:
|
||||
- ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
- ./volumes/cluster_node_2:/var/lib/echovault
|
||||
networks:
|
||||
- testnet
|
||||
|
||||
cluster_node_3:
|
||||
container_name: cluster_node_3
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
environment:
|
||||
- PORT=7480
|
||||
- RAFT_PORT=8000
|
||||
- ML_PORT=7946
|
||||
- KEY=/generic/ssl/certs/echovault/server1.key
|
||||
- CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
- SERVER_ID=3
|
||||
- JOIN_ADDR=cluster_node_1:7946
|
||||
- DATA_DIR=/var/lib/echovault
|
||||
- IN_MEMORY=false
|
||||
- TLS=false
|
||||
- MTLS=false
|
||||
- BOOTSTRAP_CLUSTER=false
|
||||
- ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
- REQUIRE_PASS=false
|
||||
- FORWARD_COMMAND=true
|
||||
- SNAPSHOT_THRESHOLD=1000
|
||||
- SNAPSHOT_INTERVAL=5m30s
|
||||
- RESTORE_SNAPSHOT=false
|
||||
- RESTORE_AOF=false
|
||||
- AOF_SYNC_STRATEGY=everysec
|
||||
- MAX_MEMORY=2000kb
|
||||
- EVICTION_POLICY=allkeys-lfu
|
||||
# List of server cert/key pairs
|
||||
- CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
- CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# List of client certificate authorities
|
||||
- CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
ports:
|
||||
- "7483:7480"
|
||||
- "7948:7946"
|
||||
- "8002:8000"
|
||||
volumes:
|
||||
- ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
- ./volumes/cluster_node_3:/var/lib/echovault
|
||||
networks:
|
||||
- testnet
|
||||
|
||||
cluster_node_4:
|
||||
container_name: cluster_node_4
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
environment:
|
||||
- PORT=7480
|
||||
- RAFT_PORT=8000
|
||||
- ML_PORT=7946
|
||||
- KEY=/generic/ssl/certs/echovault/server1.key
|
||||
- CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
- SERVER_ID=4
|
||||
- JOIN_ADDR=cluster_node_1:7946
|
||||
- DATA_DIR=/var/lib/echovault
|
||||
- IN_MEMORY=false
|
||||
- TLS=false
|
||||
- MTLS=false
|
||||
- BOOTSTRAP_CLUSTER=false
|
||||
- ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
- REQUIRE_PASS=false
|
||||
- FORWARD_COMMAND=true
|
||||
- SNAPSHOT_THRESHOLD=1000
|
||||
- SNAPSHOT_INTERVAL=5m30s
|
||||
- RESTORE_SNAPSHOT=false
|
||||
- RESTORE_AOF=false
|
||||
- AOF_SYNC_STRATEGY=everysec
|
||||
- MAX_MEMORY=2000kb
|
||||
- EVICTION_POLICY=allkeys-lfu
|
||||
# List of server cert/key pairs
|
||||
- CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
- CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# List of client certificate authorities
|
||||
- CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
ports:
|
||||
- "7484:7480"
|
||||
- "7949:7946"
|
||||
- "8003:8000"
|
||||
volumes:
|
||||
- ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
- ./volumes/cluster_node_4:/var/lib/echovault
|
||||
networks:
|
||||
- testnet
|
||||
|
||||
cluster_node_5:
|
||||
container_name: cluster_node_5
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
environment:
|
||||
- PORT=7480
|
||||
- RAFT_PORT=8000
|
||||
- ML_PORT=7946
|
||||
- KEY=/generic/ssl/certs/echovault/server1.key
|
||||
- CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
- SERVER_ID=5
|
||||
- JOIN_ADDR=cluster_node_1:7946
|
||||
- DATA_DIR=/var/lib/echovault
|
||||
- IN_MEMORY=false
|
||||
- TLS=false
|
||||
- MTLS=false
|
||||
- BOOTSTRAP_CLUSTER=false
|
||||
- ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
- REQUIRE_PASS=false
|
||||
- FORWARD_COMMAND=true
|
||||
- SNAPSHOT_THRESHOLD=1000
|
||||
- SNAPSHOT_INTERVAL=5m30s
|
||||
- RESTORE_SNAPSHOT=false
|
||||
- RESTORE_AOF=false
|
||||
- AOF_SYNC_STRATEGY=everysec
|
||||
- MAX_MEMORY=2000kb
|
||||
- EVICTION_POLICY=allkeys-lfu
|
||||
# List of server cert/key pairs
|
||||
- CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
- CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# List of client certificate authorities
|
||||
- CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
ports:
|
||||
- "7485:7480"
|
||||
- "7950:7946"
|
||||
- "8004:8000"
|
||||
volumes:
|
||||
- ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
- ./volumes/cluster_node_5:/var/lib/echovault
|
||||
networks:
|
||||
- testnet
|
||||
# cluster_node_1:
|
||||
# container_name: cluster_node_1
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: Dockerfile.dev
|
||||
# environment:
|
||||
# - PORT=7480
|
||||
# - RAFT_PORT=8000
|
||||
# - ML_PORT=7946
|
||||
# - KEY=/generic/ssl/certs/echovault/server1.key
|
||||
# - CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
# - SERVER_ID=1
|
||||
# - DATA_DIR=/var/lib/echovault
|
||||
# - IN_MEMORY=false
|
||||
# - TLS=false
|
||||
# - MTLS=false
|
||||
# - BOOTSTRAP_CLUSTER=true
|
||||
# - ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
# - REQUIRE_PASS=false
|
||||
# - FORWARD_COMMAND=true
|
||||
# - SNAPSHOT_THRESHOLD=1000
|
||||
# - SNAPSHOT_INTERVAL=5m30s
|
||||
# - RESTORE_SNAPSHOT=false
|
||||
# - RESTORE_AOF=false
|
||||
# - AOF_SYNC_STRATEGY=everysec
|
||||
# - MAX_MEMORY=2000kb
|
||||
# - EVICTION_POLICY=allkeys-lfu
|
||||
# # List of server cert/key pairs
|
||||
# - CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
# - CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# # List of client certificate authorities
|
||||
# - CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
# ports:
|
||||
# - "7481:7480"
|
||||
# - "7945:7946"
|
||||
# - "8000:8000"
|
||||
# volumes:
|
||||
# - ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
# - ./volumes/cluster_node_1:/var/lib/echovault
|
||||
# networks:
|
||||
# - testnet
|
||||
#
|
||||
# cluster_node_2:
|
||||
# container_name: cluster_node_2
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: Dockerfile.dev
|
||||
# environment:
|
||||
# - PORT=7480
|
||||
# - RAFT_PORT=8000
|
||||
# - ML_PORT=7946
|
||||
# - KEY=/generic/ssl/certs/echovault/server1.key
|
||||
# - CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
# - SERVER_ID=2
|
||||
# - JOIN_ADDR=cluster_node_1:7946
|
||||
# - DATA_DIR=/var/lib/echovault
|
||||
# - IN_MEMORY=false
|
||||
# - TLS=false
|
||||
# - MTLS=false
|
||||
# - BOOTSTRAP_CLUSTER=false
|
||||
# - ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
# - REQUIRE_PASS=false
|
||||
# - FORWARD_COMMAND=true
|
||||
# - SNAPSHOT_THRESHOLD=1000
|
||||
# - SNAPSHOT_INTERVAL=5m30s
|
||||
# - RESTORE_SNAPSHOT=false
|
||||
# - RESTORE_AOF=false
|
||||
# - AOF_SYNC_STRATEGY=everysec
|
||||
# - MAX_MEMORY=2000kb
|
||||
# - EVICTION_POLICY=allkeys-lfu
|
||||
# # List of server cert/key pairs
|
||||
# - CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
# - CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# # List of client certificate authorities
|
||||
# - CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
# ports:
|
||||
# - "7482:7480"
|
||||
# - "7947:7946"
|
||||
# - "8001:8000"
|
||||
# volumes:
|
||||
# - ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
# - ./volumes/cluster_node_2:/var/lib/echovault
|
||||
# networks:
|
||||
# - testnet
|
||||
#
|
||||
# cluster_node_3:
|
||||
# container_name: cluster_node_3
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: Dockerfile.dev
|
||||
# environment:
|
||||
# - PORT=7480
|
||||
# - RAFT_PORT=8000
|
||||
# - ML_PORT=7946
|
||||
# - KEY=/generic/ssl/certs/echovault/server1.key
|
||||
# - CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
# - SERVER_ID=3
|
||||
# - JOIN_ADDR=cluster_node_1:7946
|
||||
# - DATA_DIR=/var/lib/echovault
|
||||
# - IN_MEMORY=false
|
||||
# - TLS=false
|
||||
# - MTLS=false
|
||||
# - BOOTSTRAP_CLUSTER=false
|
||||
# - ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
# - REQUIRE_PASS=false
|
||||
# - FORWARD_COMMAND=true
|
||||
# - SNAPSHOT_THRESHOLD=1000
|
||||
# - SNAPSHOT_INTERVAL=5m30s
|
||||
# - RESTORE_SNAPSHOT=false
|
||||
# - RESTORE_AOF=false
|
||||
# - AOF_SYNC_STRATEGY=everysec
|
||||
# - MAX_MEMORY=2000kb
|
||||
# - EVICTION_POLICY=allkeys-lfu
|
||||
# # List of server cert/key pairs
|
||||
# - CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
# - CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# # List of client certificate authorities
|
||||
# - CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
# ports:
|
||||
# - "7483:7480"
|
||||
# - "7948:7946"
|
||||
# - "8002:8000"
|
||||
# volumes:
|
||||
# - ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
# - ./volumes/cluster_node_3:/var/lib/echovault
|
||||
# networks:
|
||||
# - testnet
|
||||
#
|
||||
# cluster_node_4:
|
||||
# container_name: cluster_node_4
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: Dockerfile.dev
|
||||
# environment:
|
||||
# - PORT=7480
|
||||
# - RAFT_PORT=8000
|
||||
# - ML_PORT=7946
|
||||
# - KEY=/generic/ssl/certs/echovault/server1.key
|
||||
# - CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
# - SERVER_ID=4
|
||||
# - JOIN_ADDR=cluster_node_1:7946
|
||||
# - DATA_DIR=/var/lib/echovault
|
||||
# - IN_MEMORY=false
|
||||
# - TLS=false
|
||||
# - MTLS=false
|
||||
# - BOOTSTRAP_CLUSTER=false
|
||||
# - ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
# - REQUIRE_PASS=false
|
||||
# - FORWARD_COMMAND=true
|
||||
# - SNAPSHOT_THRESHOLD=1000
|
||||
# - SNAPSHOT_INTERVAL=5m30s
|
||||
# - RESTORE_SNAPSHOT=false
|
||||
# - RESTORE_AOF=false
|
||||
# - AOF_SYNC_STRATEGY=everysec
|
||||
# - MAX_MEMORY=2000kb
|
||||
# - EVICTION_POLICY=allkeys-lfu
|
||||
# # List of server cert/key pairs
|
||||
# - CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
# - CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# # List of client certificate authorities
|
||||
# - CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
# ports:
|
||||
# - "7484:7480"
|
||||
# - "7949:7946"
|
||||
# - "8003:8000"
|
||||
# volumes:
|
||||
# - ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
# - ./volumes/cluster_node_4:/var/lib/echovault
|
||||
# networks:
|
||||
# - testnet
|
||||
#
|
||||
# cluster_node_5:
|
||||
# container_name: cluster_node_5
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: Dockerfile.dev
|
||||
# environment:
|
||||
# - PORT=7480
|
||||
# - RAFT_PORT=8000
|
||||
# - ML_PORT=7946
|
||||
# - KEY=/generic/ssl/certs/echovault/server1.key
|
||||
# - CERT=/generic/ssl/certs/echovault/server1.crt
|
||||
# - SERVER_ID=5
|
||||
# - JOIN_ADDR=cluster_node_1:7946
|
||||
# - DATA_DIR=/var/lib/echovault
|
||||
# - IN_MEMORY=false
|
||||
# - TLS=false
|
||||
# - MTLS=false
|
||||
# - BOOTSTRAP_CLUSTER=false
|
||||
# - ACL_CONFIG=/generic/config/echovault/acl.yml
|
||||
# - REQUIRE_PASS=false
|
||||
# - FORWARD_COMMAND=true
|
||||
# - SNAPSHOT_THRESHOLD=1000
|
||||
# - SNAPSHOT_INTERVAL=5m30s
|
||||
# - RESTORE_SNAPSHOT=false
|
||||
# - RESTORE_AOF=false
|
||||
# - AOF_SYNC_STRATEGY=everysec
|
||||
# - MAX_MEMORY=2000kb
|
||||
# - EVICTION_POLICY=allkeys-lfu
|
||||
# # List of server cert/key pairs
|
||||
# - CERT_KEY_PAIR_1=/generic/ssl/certs/echovault/server/server1.crt,/generic/ssl/certs/echovault/server/server1.key
|
||||
# - CERT_KEY_PAIR_2=/generic/ssl/certs/echovault/server/server2.crt,/generic/ssl/certs/echovault/server/server2.key
|
||||
# # List of client certificate authorities
|
||||
# - CLIENT_CA_1=/generic/ssl/certs/echovault/client/rootCA.crt
|
||||
# ports:
|
||||
# - "7485:7480"
|
||||
# - "7950:7946"
|
||||
# - "8004:8000"
|
||||
# volumes:
|
||||
# - ./config/acl.yml:/generic/config/echovault/acl.yml
|
||||
# - ./volumes/cluster_node_5:/var/lib/echovault
|
||||
# networks:
|
||||
# - testnet
|
||||
Reference in New Issue
Block a user