RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: prohibit communication with wrong UUID

This commit is contained in:
Thomas Schoebel-Theuer 2015-03-05 12:07:34 +01:00
parent 8a269b2412
commit 7f565f77b6
2 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docu/mars-manual.lyx
View File

@ -12885,7 +12885,35 @@ complex
\family typewriter
/mars/
\family default
directory tree are automatically replicated thoughout the whole cluster.
directory tree are automatically replicated thoughout the whole cluster,
provided that the cluster
\family typewriter
uuid
\family default
s are equal
\begin_inset Foot
status open
\begin_layout Plain Layout
This is protection against accidental
\begin_inset Quotes eld
\end_inset
merging
\begin_inset Quotes erd
\end_inset
of two unrelated clusters which had been created at different times with
different
\family typewriter
uuids
\family default
.
\end_layout
\end_inset
at all sites.
Thus the
\family typewriter
/mars/

51
kernel/sy_old/mars_light.c
View File

@ -2022,7 +2022,16 @@ int peer_thread(void *data)
}
while (!brick_thread_should_stop()) {
LIST_HEAD(tmp_list);
struct mars_global tmp_global = {
.dent_anchor = LIST_HEAD_INIT(tmp_global.dent_anchor),
.brick_anchor = LIST_HEAD_INIT(tmp_global.brick_anchor),
.global_power = {
.button = true,
},
.dent_mutex = __RWSEM_INITIALIZER(tmp_global.dent_mutex),
.brick_mutex = __RWSEM_INITIALIZER(tmp_global.brick_mutex),
.main_event = __WAIT_QUEUE_HEAD_INITIALIZER(tmp_global.main_event),
};
LIST_HEAD(old_list);
unsigned long flags;
struct mars_cmd cmd = {
@ -2070,8 +2079,6 @@ int peer_thread(void *data)
continue;
}
make_msg(peer_pairs, "CONNECTED %s(%s)", peer->peer, real_peer);
if (peer->from_remote_trigger) {
pause_time = 0;
peer->from_remote_trigger = false;
@ -2102,25 +2109,50 @@ int peer_thread(void *data)
}
MARS_DBG("fetching remote dentry list\n");
status = mars_recv_dent_list(&peer->socket, &tmp_list);
status = mars_recv_dent_list(&peer->socket, &tmp_global.dent_anchor);
if (unlikely(status < 0)) {
MARS_WRN("communication error on receive, status = %d\n", status);
if (do_kill) {
do_kill = false;
_peer_cleanup(peer);
}
mars_free_dent_all(NULL, &tmp_list);
goto free_and_restart;
mars_free_dent_all(NULL, &tmp_global.dent_anchor);
brick_msleep(2000);
continue;
}
if (likely(!list_empty(&tmp_list))) {
if (likely(!list_empty(&tmp_global.dent_anchor))) {
struct mars_dent *peer_uuid;
struct mars_dent *my_uuid;
MARS_DBG("got remote denties\n");
peer_uuid = mars_find_dent(&tmp_global, "/mars/uuid");
if (unlikely(!peer_uuid || !peer_uuid->new_link)) {
MARS_ERR("peer %s has no uuid\n", peer->peer);
make_msg(peer_pairs, "peer has no UUID");
goto free_and_restart;
}
my_uuid = mars_find_dent(mars_global, "/mars/uuid");
if (unlikely(!my_uuid || !my_uuid->new_link)) {
MARS_ERR("cannot determine my own uuid for peer %s\n", peer->peer);
make_msg(peer_pairs, "cannot determine my own uuid");
goto free_and_restart;
}
if (unlikely(strcmp(peer_uuid->new_link, my_uuid->new_link))) {
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, own cluster '%s' is trying to communicate with a foreign cluster '%s'",
my_uuid->new_link, peer_uuid->new_link);
goto free_and_restart;
}
make_msg(peer_pairs, "CONNECTED %s(%s)", peer->peer, real_peer);
traced_lock(&peer->lock, flags);
list_replace_init(&peer->remote_dent_list, &old_list);
list_replace_init(&tmp_list, &peer->remote_dent_list);
list_replace_init(&tmp_global.dent_anchor, &peer->remote_dent_list);
traced_unlock(&peer->lock, flags);
@ -2140,6 +2172,11 @@ int peer_thread(void *data)
(mars_global && mars_global->main_trigger),
pause_time * HZ);
}
continue;
free_and_restart:
mars_free_dent_all(NULL, &tmp_global.dent_anchor);
brick_msleep(2000);
}
MARS_INF("-------- peer thread terminating\n");