projects
/
bluesky.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix another cleaner bug
[bluesky.git]
/
bluesky
/
cleaner.c
diff --git
a/bluesky/cleaner.c
b/bluesky/cleaner.c
index
5f241d4
..
be0ab6a
100644
(file)
--- a/
bluesky/cleaner.c
+++ b/
bluesky/cleaner.c
@@
-115,7
+115,8
@@
static BlueSkyCleanerItem *bluesky_cleaner_find_checkpoint(BlueSkyFS *fs)
if (last_segment == NULL)
return NULL;
if (last_segment == NULL)
return NULL;
- g_print("Last cloud log segment: %s\n", last_segment);
+ g_print("Last cloud log segment: %s (processed up to %d)\n",
+ last_segment, fs->log_state->latest_cleaner_seq_seen);
int seq = atoi(last_segment + 13);
g_free(last_segment);
int seq = atoi(last_segment + 13);
g_free(last_segment);
@@
-156,7
+157,7
@@
static BlueSkyCleanerItem *bluesky_cleaner_find_checkpoint(BlueSkyFS *fs)
BlueSkyCleanerItem *checkpoint = bluesky_cleaner_deserialize(data);
checkpoint->location.directory = BLUESKY_CLOUD_DIR_CLEANER;
BlueSkyCleanerItem *checkpoint = bluesky_cleaner_deserialize(data);
checkpoint->location.directory = BLUESKY_CLOUD_DIR_CLEANER;
- checkpoint->location.
directory
= seq;
+ checkpoint->location.
sequence
= seq;
bluesky_string_unref(data);
return checkpoint;
bluesky_string_unref(data);
return checkpoint;
@@
-331,7
+332,7
@@
void bluesky_cleaner_merge(BlueSkyFS *fs)
bluesky_cleaner_item_free(imap);
}
bluesky_cleaner_item_free(imap);
}
- fs->log_state->latest_cleaner_seq_seen = checkpoint->location.
directory
;
+ fs->log_state->latest_cleaner_seq_seen = checkpoint->location.
sequence
;
bluesky_cleaner_item_free(checkpoint);
}
bluesky_cleaner_item_free(checkpoint);
}