ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-20 05:37:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fail writing content if it has already been closed

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-08-26 17:38:46 +09:30
parent 1b26917f58
commit ceb7f9d4c9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rhizome_store.c
View File

@ -431,6 +431,8 @@ int rhizome_fail_write(struct rhizome_write *write){
} }
int rhizome_finish_write(struct rhizome_write *write){ int rhizome_finish_write(struct rhizome_write *write){
if (write->blob_rowid==-1 && write->blob_fd == -1)
return WHY("Can't finish a write that has already been closed");
if (write->buffer_list){ if (write->buffer_list){
if (rhizome_random_write(write, 0, NULL, 0)) if (rhizome_random_write(write, 0, NULL, 0))
goto failure; goto failure;
@ -458,17 +460,16 @@ int rhizome_finish_write(struct rhizome_write *write){
SHA512_End(&write->sha512_context, hash_out); SHA512_End(&write->sha512_context, hash_out);
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT; sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
goto dbfailure;
if (write->id_known){ if (write->id_known){
if (strcasecmp(write->id, hash_out)){ if (strcasecmp(write->id, hash_out)){
WHYF("Expected hash=%s, got %s", write->id, hash_out); WHYF("Expected hash=%s, got %s", write->id, hash_out);
goto dbfailure; goto failure;
} }
if (sqlite_exec_void_retry(&retry, "UPDATE FILES SET inserttime=%lld, datavalid=1 WHERE id='%s'", if (sqlite_exec_void_retry(&retry, "UPDATE FILES SET inserttime=%lld, datavalid=1 WHERE id='%s'",
gettime_ms(), write->id) == -1) gettime_ms(), write->id) == -1)
goto dbfailure; goto failure;
}else{ }else{
str_toupper_inplace(hash_out); str_toupper_inplace(hash_out);
@ -476,6 +477,9 @@ int rhizome_finish_write(struct rhizome_write *write){
// ooops, we've already got that file, delete the new copy. // ooops, we've already got that file, delete the new copy.
rhizome_fail_write(write); rhizome_fail_write(write);
}else{ }else{
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;") == -1)
goto dbfailure;
// delete any half finished records // delete any half finished records
sqlite_exec_void_retry_loglevel(LOG_LEVEL_WARN, &retry,"DELETE FROM FILEBLOBS WHERE id='%s';",hash_out); sqlite_exec_void_retry_loglevel(LOG_LEVEL_WARN, &retry,"DELETE FROM FILEBLOBS WHERE id='%s';",hash_out);
sqlite_exec_void_retry_loglevel(LOG_LEVEL_WARN, &retry,"DELETE FROM FILES WHERE id='%s';",hash_out); sqlite_exec_void_retry_loglevel(LOG_LEVEL_WARN, &retry,"DELETE FROM FILES WHERE id='%s';",hash_out);
@ -511,11 +515,11 @@ int rhizome_finish_write(struct rhizome_write *write){
goto dbfailure; goto dbfailure;
} }
} }
if (sqlite_exec_void_retry(&retry, "COMMIT;") == -1)
goto dbfailure;
} }
strlcpy(write->id, hash_out, SHA512_DIGEST_STRING_LENGTH); strlcpy(write->id, hash_out, SHA512_DIGEST_STRING_LENGTH);
} }
if (sqlite_exec_void_retry(&retry, "COMMIT;") == -1)
goto dbfailure;
write->blob_rowid=-1; write->blob_rowid=-1;
if (config.debug.rhizome) if (config.debug.rhizome)