Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix migrate failure if source is multi-aof file or distribution is modula/random #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix migrate failure if source is multi-aof file or distribution is modula/random #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/rmt_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2511,12 +2511,12 @@ void redis_migrate(rmtContext *ctx, int type)
node_next_nodes_count ++;
rnode = rnode->next;
}
if (node_next_nodes_count != wdata->nodes_count &&
/*if (node_next_nodes_count != wdata->nodes_count &&
srgroup->kind != GROUP_TYPE_RDBFILE) {
log_error("Error: node_next_nodes_count %d != write_data->nodes_count %d.",
node_next_nodes_count, wdata->nodes_count);
goto done;
}
}*/
}
if (threads_hold_nodes_count != node_count) {
log_error("Error: write threads hold node count %s is wrong",
Expand Down
25 changes: 16 additions & 9 deletions src/rmt_redis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,8 @@ int redis_group_init(rmtContext *ctx, redis_group *rgroup,
rgroup->key_hash = NULL;
rgroup->ncontinuum = 0;

rgroup->distribution = CONF_UNSET_DIST;

rgroup->ctx = ctx;

if(source) {
Expand Down Expand Up @@ -667,6 +669,7 @@ void redis_group_deinit(redis_group *rgroup)

rgroup->ncontinuum = 0;
rgroup->ctx = NULL;
rgroup->distribution = CONF_UNSET_DIST;
}

int redis_rdb_init(redis_rdb *rdb, const char *addr, int type)
Expand Down Expand Up @@ -6552,11 +6555,13 @@ int redis_parse_rdb_file(redis_node *srnode, int mbuf_count_one_time)
log_debug(LOG_DEBUG, "key: %s, value array length: %u",
key, array_n(value));

if (rdb->handler != NULL &&
(srgroup->kind == GROUP_TYPE_SINGLE || srgroup->get_backend_node == NULL ||
srgroup->get_backend_node(srgroup, key, sdslen(key)) == srnode) &&
(ctx->filter == NULL ||
stringmatchlen(ctx->filter, sdslen(ctx->filter), key, sdslen(key), 0))) {
if (rdb->handler != NULL
&& (srgroup->kind == GROUP_TYPE_SINGLE
|| srgroup->get_backend_node == NULL
|| (srgroup->distribution != DIST_RANDOM && srgroup->get_backend_node(srgroup, key, sdslen(key)) == srnode)
|| srgroup->distribution == DIST_RANDOM)
&& (ctx->filter == NULL
|| stringmatchlen(ctx->filter, sdslen(ctx->filter), key, sdslen(key), 0))) {
ret = rdb->handler(srnode, key, data_type, value,
expiretime_type, expiretime, trgroup);
if (ret < 0) {
Expand Down Expand Up @@ -7786,6 +7791,8 @@ redis_twem_init_from_conf(redis_group *rgroup, conf_pool *cp)
parts = NULL;
}

rgroup->distribution = cp->distribution;

switch(cp->distribution){
case DIST_KETAMA:
ret = redis_twem_init_route_with_ketama(rgroup, &nodes, total_weight);
Expand Down Expand Up @@ -7896,8 +7903,8 @@ redis_twem_random_dispatch(struct array *continuums, uint32_t ncontinuum, uint32
uint32_t
redis_twem_backend_idx(redis_group *rgroup, uint8_t *key, uint32_t keylen)
{
uint32_t idx, hash;
int distribution = DIST_KETAMA;
uint32_t idx = 0, hash;
int distribution = rgroup->distribution;//DIST_KETAMA;
struct continuum *continuum;

RMT_NOTUSED(rgroup);
Expand Down Expand Up @@ -7930,8 +7937,8 @@ redis_twem_backend_idx(redis_group *rgroup, uint8_t *key, uint32_t keylen)
redis_node *
redis_twem_backend_node(redis_group *rgroup, uint8_t *key, uint32_t keylen)
{
uint32_t idx, hash;
int distribution = DIST_KETAMA;
uint32_t idx = 0, hash;
int distribution = rgroup->distribution;//DIST_KETAMA;
struct continuum *continuum;

RMT_NOTUSED(rgroup);
Expand Down
2 changes: 2 additions & 0 deletions src/rmt_redis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ typedef struct redis_group{
hash_t key_hash;

uint32_t ncontinuum; /* # continuum points */

dist_type_t distribution;
}redis_group;

typedef struct redis_node{
Expand Down