RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-24 23:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: allow exceptional fresh uuid communication

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-07-17 12:09:55 +02:00 committed by Thomas Schoebel-Theuer
parent ff79d8b30d
commit 987154052f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sy_old/mars_main.c
View File

@ -2447,7 +2447,6 @@ int peer_action_dent_list(struct mars_global *tmp_global,
LIST_HEAD(old_list); LIST_HEAD(old_list);
struct mars_dent *peer_uuid; struct mars_dent *peer_uuid;
const char *my_uuid; const char *my_uuid;
int cmp;
MARS_DBG("got remote denties from %s\n", peer->peer); MARS_DBG("got remote denties from %s\n", peer->peer);
@ -2466,8 +2465,8 @@ int peer_action_dent_list(struct mars_global *tmp_global,
status = -EPROTO; status = -EPROTO;
goto free; goto free;
} }
cmp = strcmp(peer_uuid->new_link, my_uuid); if (unlikely(strcmp(peer_uuid->new_link, my_uuid) &&
if (unlikely(cmp)) { strcmp(my_uuid, "(any)"))) {
MARS_ERR("UUID mismatch for peer %s, you are trying to communicate with a foreign cluster!\n", peer->peer); MARS_ERR("UUID mismatch for peer %s, you are trying to communicate with a foreign cluster!\n", peer->peer);
make_msg(peer_pairs, "UUID mismatch with '%s', own cluster '%s' is trying to communicate with a foreign cluster '%s'", make_msg(peer_pairs, "UUID mismatch with '%s', own cluster '%s' is trying to communicate with a foreign cluster '%s'",
peer->peer, peer->peer,