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

infra: remember Lamport stamp of remote link tree

This commit is contained in:
Thomas Schoebel-Theuer 2020-06-30 08:45:13 +02:00 committed by Thomas Schoebel-Theuer
parent e551b6d89f
commit 5071b3d0b2
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/mars_server.c
View File

@ -499,6 +499,8 @@ int handler_thread(void *data)
*/
if (sock->s_common_proto_level > 0 &&
old_proto_level > 0) {
/* send Lamport stamp of local /mars status */
get_lamport(NULL, &cmd.cmd_stamp);
down(&brick->socket_sem);
status = mars_send_cmd(sock, &cmd, true);
old_proto_level = sock->s_common_proto_level;

38
kernel/sy_old/mars_main.c
View File

@ -1838,6 +1838,7 @@ struct mars_peerinfo {
struct mutex peer_lock;
struct list_head peer_head;
struct list_head remote_dent_list;
struct lamport_time remote_start_stamp;
unsigned long last_remote_jiffies;
int maxdepth;
int features_version;
@ -2285,12 +2286,14 @@ static
int run_bones(struct mars_peerinfo *peer)
{
LIST_HEAD(tmp_list);
struct lamport_time remote_start_stamp;
struct list_head *tmp;
bool run_trigger = false;
bool run_systemd_trigger = false;
int status = 0;
mutex_lock(&peer->peer_lock);
remote_start_stamp = peer->remote_start_stamp;
list_replace_init(&peer->remote_dent_list, &tmp_list);
mutex_unlock(&peer->peer_lock);
@ -2317,6 +2320,24 @@ int run_bones(struct mars_peerinfo *peer)
//MARS_DBG("path = '%s' worker status = %d\n", remote_dent->d_path, status);
}
if (remote_start_stamp.tv_sec) {
const char *src;
const char *dst;
src = path_make("%ld.%09ld",
remote_start_stamp.tv_sec,
remote_start_stamp.tv_nsec);
dst = path_make("/mars/actual-%s/read-stamp",
peer->peer);
/* Notice: while src shows the remote Lamport stamp when
* the link tree was initially read, the target Lamport stamp
* indicates when all the info was merged locally.
*/
ordered_symlink(src, dst, NULL);
brick_string_free(src);
brick_string_free(dst);
}
mars_free_dent_all(NULL, &tmp_list);
if (run_trigger) {
@ -2375,7 +2396,8 @@ int peer_action_dent_list(struct mars_global *tmp_global,
struct mars_peerinfo *peer,
const char *real_peer,
const char *paths,
struct key_value_pair *peer_pairs)
struct key_value_pair *peer_pairs,
struct lamport_time *start_stamp)
{
int status;
@ -2427,6 +2449,7 @@ int peer_action_dent_list(struct mars_global *tmp_global,
mutex_lock(&peer->peer_lock);
peer->remote_start_stamp = *start_stamp;
list_replace_init(&peer->remote_dent_list, &old_list);
list_replace_init(&tmp_global->dent_anchor, &peer->remote_dent_list);
list_del_init(&tmp_global->dent_quick_anchor);
@ -2462,7 +2485,8 @@ int peer_actions(struct mars_global *tmp_global,
if (!peer->socket.s_common_proto_level)
return peer_action_dent_list(tmp_global,
peer, real_peer, paths,
peer_pairs);
peer_pairs,
&inter_cmd.cmd_stamp);
/* New protocoal with extensible cases */
status = mars_recv_cmd(&peer->socket, &inter_cmd);
@ -2474,9 +2498,13 @@ int peer_actions(struct mars_global *tmp_global,
switch (inter_cmd.cmd_code) {
case CMD_GETENTS:
{
status = peer_action_dent_list(tmp_global,
peer, real_peer,
paths, peer_pairs);
status = peer_action_dent_list(
tmp_global,
peer,
real_peer,
paths,
peer_pairs,
&inter_cmd.cmd_stamp);
break;
}
default: