map->prefetches = bluesky_rangeset_new();
gchar *id = bluesky_cloudlog_id_to_string(item->id);
- g_print("Need to prefetch %s\n", id);
+ if (bluesky_verbose)
+ g_print("Need to prefetch %s\n", id);
g_free(id);
bluesky_rangeset_insert(map->prefetches,
uint64_t start, length;
bluesky_rangeset_get_extents(map->prefetches, &start, &length);
- g_print("Range to prefetch: %"PRIu64" + %"PRIu64"\n", start, length);
+ if (bluesky_verbose)
+ g_print("Range to prefetch: %"PRIu64" + %"PRIu64"\n",
+ start, length);
}
bluesky_cachefile_unref(map);
if (log->data != NULL)
return;
+ BlueSkyProfile *profile = bluesky_profile_get();
+ if (profile != NULL)
+ bluesky_profile_add_event(profile, g_strdup_printf("Fetch log entry"));
+
/* There are actually two cases: a full deserialization if we have not ever
* read the object before, and a partial deserialization where the metadata
* is already in memory and we just need to remap the data. If the object
g_error("Unable to fetch cloudlog entry!");
}
+ if (profile != NULL)
+ bluesky_profile_add_event(profile, g_strdup_printf("Fetch complete"));
g_cond_broadcast(log->cond);
}
bluesky_cloudlog_serialize(ref, fs);
}
+ /* FIXME: Ought lock to be taken earlier? */
g_mutex_lock(log->lock);
bluesky_cloudlog_fetch(log);
g_assert(log->data != NULL);
async2->op = STORE_OP_PUT;
async2->key = g_strdup(async->key);
async2->data = record->data;
+ async2->profile = async->profile;
bluesky_string_ref(record->data);
bluesky_store_async_submit(async2);
bluesky_store_async_add_notifier(async2,
/* Make an decryption pass over a cloud log segment to decrypt items which were
* encrypted. Also computes a list of all offsets which at which valid
- * cloud log items are found and adds those offsets to items (if non-NULL). */
+ * cloud log items are found and adds those offsets to items (if non-NULL).
+ *
+ * If allow_unauth is set to true, then allow a limited set of unauthenticated
+ * items that may have been rewritten by a file system cleaner. These include
+ * the checkpoint and inode map records only; other items must still pass
+ * authentication. */
void bluesky_cloudlog_decrypt(char *segment, size_t len,
BlueSkyCryptKeys *keys,
- BlueSkyRangeset *items)
+ BlueSkyRangeset *items,
+ gboolean allow_unauth)
{
char *data = segment;
size_t remaining_size = len;
+ GUINT32_FROM_LE(header->size3);
if (item_size > remaining_size)
break;
- if (bluesky_crypt_block_decrypt(data, item_size, keys)) {
+ if (bluesky_crypt_block_decrypt(data, item_size, keys, allow_unauth)) {
if (items != NULL) {
- g_print(" data item at %zx\n", offset);
+ if (bluesky_verbose)
+ g_print(" data item at %zx\n", offset);
bluesky_rangeset_insert(items, offset, item_size,
GINT_TO_POINTER(TRUE));
}