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

fixed server, added symlink indicating aliveness of peers

This commit is contained in:
Thomas Schoebel-Theuer 2011-10-18 10:20:10 +02:00 committed by Thomas Schoebel-Theuer
parent 6bad7eca8d
commit 13ca3a8563
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mars_server.c
View File

@ -566,6 +566,13 @@ static int _server_thread(void *data)
MARS_INF("-------- server starting on host '%s' ----------\n", id); MARS_INF("-------- server starting on host '%s' ----------\n", id);
while (!kthread_should_stop() &&
(!mars_global || !mars_global->global_power.button)) {
msleep(1000);
}
MARS_INF("-------- server now working on host '%s' ----------\n", id);
while (!kthread_should_stop() && mars_global && mars_global->global_power.button) { while (!kthread_should_stop() && mars_global && mars_global->global_power.button) {
struct server_brick *brick; struct server_brick *brick;
struct mars_socket *new_socket; struct mars_socket *new_socket;

23
sy_old/mars_light.c
View File

@ -1037,7 +1037,7 @@ static int _make_peer(struct mars_global *global, struct mars_dent *dent, char *
peer = dent->d_private; peer = dent->d_private;
if (!peer->peer_thread) { if (!peer->peer_thread) {
peer->peer_thread = kthread_create(remote_thread, peer, "mars_remote%d", serial++); peer->peer_thread = kthread_create(remote_thread, peer, "mars_peer%d", serial++);
if (unlikely(IS_ERR(peer->peer_thread))) { if (unlikely(IS_ERR(peer->peer_thread))) {
MARS_ERR("cannot start peer thread, status = %d\n", (int)PTR_ERR(peer->peer_thread)); MARS_ERR("cannot start peer thread, status = %d\n", (int)PTR_ERR(peer->peer_thread));
peer->peer_thread = NULL; peer->peer_thread = NULL;
@ -2385,6 +2385,7 @@ enum {
// replacement for DNS in kernelspace // replacement for DNS in kernelspace
CL_IPS, CL_IPS,
CL_PEERS, CL_PEERS,
CL_ALIVE,
// resource definitions // resource definitions
CL_RESOURCE, CL_RESOURCE,
CL_DEFAULTS0, CL_DEFAULTS0,
@ -2439,6 +2440,15 @@ static const struct light_class light_classes[] = {
#endif #endif
.cl_backward = kill_scan, .cl_backward = kill_scan,
}, },
/* Indicate aliveness of all cluster paritcipants
* by the timestamp of this link.
*/
[CL_ALIVE] = {
.cl_name = "alive-",
.cl_len = 6,
.cl_type = 'l',
.cl_father = CL_ROOT,
},
/* Directory containing all items of a resource /* Directory containing all items of a resource
*/ */
@ -2898,6 +2908,15 @@ void _show_statist(struct mars_global *global)
} }
#endif #endif
static
void _make_alivelink(bool alive)
{
char *src = alive ? "1" : "0";
char *dst = path_make("/mars/alive-%s", my_id());
mars_symlink(src, dst, NULL, 0);
brick_string_free(dst);
}
static struct mars_global _global = { static struct mars_global _global = {
.dent_anchor = LIST_HEAD_INIT(_global.dent_anchor), .dent_anchor = LIST_HEAD_INIT(_global.dent_anchor),
.brick_anchor = LIST_HEAD_INIT(_global.brick_anchor), .brick_anchor = LIST_HEAD_INIT(_global.brick_anchor),
@ -2930,6 +2949,8 @@ static int light_thread(void *data)
int status; int status;
_global.global_power.button = !kthread_should_stop(); _global.global_power.button = !kthread_should_stop();
_make_alivelink(_global.global_power.button);
#if 1 #if 1
if (!_global.global_power.button) { if (!_global.global_power.button) {
mars_kill_brick_all(&_global, &_global.server_anchor, false); mars_kill_brick_all(&_global, &_global.server_anchor, false);