mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: allow lock_on_hashtags with any cluster mode (#2443)

Browse source 
Motivation - after we submitted #2429 some smart-ass clients
prevent users from accessing single-node commands like "SELECT".
This PR fixes it by allowing consistent sharding based on hashtags
even with cluster mode disabled.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-01-19 23:44:24 +02:00 • committed by GitHub
parent a11b2a941a
commit 8f454b2dea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/cluster/cluster_config.cc
View file

@ -51,10 +51,6 @@ bool ClusterConfig::IsEmulated() {
return cluster_mode == ClusterMode::kEmulatedCluster;
}
bool ClusterConfig::IsEnabledOrEmulated() {
return IsEnabled() || IsEmulated();
}
string_view ClusterConfig::KeyTag(string_view key) {
size_t start = key.find('{');
if (start == key.npos) {

11
src/server/cluster/cluster_config.h
View file

@ -4,7 +4,6 @@
#pragma once
#include <absl/base/thread_annotations.h>
#include <absl/container/flat_hash_set.h>
#include <array>
@ -15,6 +14,7 @@
#include "core/json_object.h"
#include "src/core/fibers.h"
#include "src/server/common.h"
namespace dfly {
@ -50,7 +50,14 @@ class ClusterConfig {
static void Initialize();
static bool IsEnabled();
static bool IsEmulated();
static bool IsEnabledOrEmulated();
static bool IsEnabledOrEmulated() {
return IsEnabled() || IsEmulated();
}
static bool IsShardedByTag() {
return IsEnabledOrEmulated() || KeyLockArgs::IsLockHashTagEnabled();
}
// If the key contains the {...} pattern, return only the part between { and }
static std::string_view KeyTag(std::string_view key);

3
src/server/common.cc
View file

@ -27,8 +27,7 @@ extern "C" {
#include "strings/human_readable.h"
ABSL_FLAG(bool, lock_on_hashtags, false,
"When true, locks are done in the {hashtag} level instead of key level. "
"Only use this with --cluster_mode=emulated|yes.");
"When true, locks are done in the {hashtag} level instead of key level.");
namespace dfly {

7
src/server/engine_shard_set.cc
View file

@ -859,11 +859,8 @@ void EngineShardSet::TEST_EnableCacheMode() {
}
ShardId Shard(string_view v, ShardId shard_num) {
if (ClusterConfig::IsEnabledOrEmulated()) {
string_view v_hash_tag = ClusterConfig::KeyTag(v);
if (v_hash_tag.size() != v.size()) {
v = v_hash_tag;
}
if (ClusterConfig::IsShardedByTag()) {
v = ClusterConfig::KeyTag(v);
}
XXH64_hash_t hash = XXH64(v.data(), v.size(), 120577240643ULL);

5
src/server/main_service.cc
View file

@ -727,11 +727,6 @@ Service::Service(ProactorPool* pp)
CHECK(pp);
CHECK(shard_set == NULL);
if (KeyLockArgs::IsLockHashTagEnabled() && !ClusterConfig::IsEnabledOrEmulated()) {
LOG(ERROR) << "Setting --lock_on_hashtags without --cluster_mode is unsupported";
exit(1);
}
#ifdef PRINT_STACKTRACES_ON_SIGNAL
LOG(INFO) << "PRINT STACKTRACES REGISTERED";
pp_.GetNextProactor()->RegisterSignal({SIGUSR1}, [this](int signal) {