struct list_info {
int success;
char *last_entry;
+ gboolean truncated;
};
static S3Status s3store_get_handler(int bufferSize, const char *buffer,
handler.responseHandler.completeCallback = s3store_response_callback;
handler.getObjectDataCallback = s3store_get_handler;
- S3_get_object(&store->bucket, async->key, NULL, 0, 0, NULL,
- &handler, &info);
+ S3_get_object(&store->bucket, async->key, NULL,
+ async->start, async->len, NULL, &handler, &info);
+ async->range_done = TRUE;
if (info.success) {
async->data = bluesky_string_new_from_gstring(info.buf);
} else if (async->op == STORE_OP_PUT) {
struct put_info info;
+ info.success = 0;
info.val = async->data;
info.offset = 0;
S3_put_object(&store->bucket, async->key, async->data->len, NULL, NULL,
&handler, &info);
- async->result = 0;
+ if (info.success) {
+ async->result = 0;
+ } else {
+ g_warning("Error completing S3 put operation; client must retry!");
+ }
}
bluesky_store_async_mark_complete(async);
g_free(info->last_entry);
info->last_entry = g_strdup(contents[contentsCount - 1].key);
}
+ info->truncated = isTruncated;
return S3StatusOK;
}
static char *s3store_lookup_last(gpointer s, const char *prefix)
{
S3Store *store = (S3Store *)s;
- struct list_info info = {0, NULL};
+ struct list_info info = {0, NULL, FALSE};
struct S3ListBucketHandler handler;
handler.responseHandler.propertiesCallback
char *marker = NULL;
- S3_list_bucket(&store->bucket, prefix, marker, NULL, 1024, NULL, &handler, &info);
+ do {
+ S3_list_bucket(&store->bucket, prefix, marker, NULL, 1024, NULL,
+ &handler, &info);
+ g_free(marker);
+ marker = g_strdup(info.last_entry);
+ g_print("Last key: %s\n", info.last_entry);
+ } while (info.truncated);
- g_print("Last key: %s\n", info.last_entry);
+ g_free(marker);
return info.last_entry;
}
else
store->bucket.bucketName = g_strdup(path);
store->bucket.protocol = S3ProtocolHTTP;
- store->bucket.uriStyle = S3UriStylePath;
+ store->bucket.uriStyle = S3UriStyleVirtualHost;
store->bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
store->bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");