Skip to content

syncer: Remove new sync partner status, even if no other data is syncd #13

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

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

syncer: Remove new sync partner status, even if no other data is syncd #13

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
84 changes: 36 additions & 48 deletions syncer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,79 +350,67 @@ sync_gather (GNode *root, uint64_t timestamp)
pthread_rwlock_unlock (&paths_lock);
}

void
sync_write_tree (sync_partner *sp, GNode *data)
{
if (APTERYX_NUM_NODES (data) > 0)
{
char *next_path = NULL;

if (asprintf (&next_path, "%s:/", sp->socket) > 0)
{
free (data->data);
data->data = next_path;
apteryx_set_tree (data);
}
}
}

bool
resync ()
{
/* Called under a lock */
GList *iter;
GNode *data = NULL;
GNode *new_data = NULL;
GNode *sync_data = NULL;
static uint64_t last_sync_local = 0;

uint64_t local_ts = apteryx_timestamp ("/");

for (iter = partners; iter; iter = iter->next)
{
sync_partner *sp = iter->data;
/* Sync the entire tree to new partners */
if (sp->new_joiner)
{
if (data == NULL)
if (new_data == NULL)
{
data = APTERYX_NODE (NULL, strdup ("/"));
new_data = APTERYX_NODE (NULL, strdup ("/"));
/* Get everything */
sync_gather (data, 0);
}
if (APTERYX_NUM_NODES (data) > 0)
{
char *next_path = NULL;

if (asprintf (&next_path, "%s:/", sp->socket) > 0)
{
free (data->data);
data->data = next_path;
apteryx_set_tree (data);
}
sync_gather (new_data, 0);
}
sync_write_tree (sp, new_data);
sp->new_joiner = false;
}
}

if (data)
{
apteryx_free_tree (data);
data = NULL;
}

/* Grab all the data that has been added since the last update... */
data = APTERYX_NODE (NULL, strdup ("/"));
sync_gather (data, last_sync_local);

if (APTERYX_NUM_NODES (data) > 0)
{
for (iter = partners; iter; iter = iter->next)
else
{
sync_partner *sp = iter->data;
if (!sp->new_joiner)
/* Sync changes since the last timestamp to existing partners */
if (sync_data == NULL)
{
char *next_path = NULL;

if (asprintf (&next_path, "%s:/", sp->socket) > 0)
{
free (data->data);
data->data = next_path;
apteryx_set_tree (data);
}
}
else
{
/* These ones will have got all the data above */
sp->new_joiner = false;
sync_data = APTERYX_NODE (NULL, strdup ("/"));
sync_gather (sync_data, last_sync_local);
}
sync_write_tree (sp, sync_data);
}
}

if (data)
if (new_data)
{
apteryx_free_tree (new_data);
}
if (sync_data)
{
apteryx_free_tree (data);
data = NULL;
apteryx_free_tree (sync_data);
}

last_sync_local = local_ts;
Expand Down