haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-16 07:10:07 +00:00
Code Issues Releases Wiki Activity

Return 409 when gc conflict (#731)

Browse Source 
* Return 409 when gc conflict

* Go return 409 when gc conflict

* Return gc conflict when sync repo

---------

Co-authored-by: 杨赫然 <heran.yang@seafile.com>
This commit is contained in:
feiniks
2024-12-30 15:03:54 +08:00
committed by GitHub
parent de62852244
commit ee9ad5ef39
6 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/upload-file.c
View File

@@ -612,6 +612,9 @@ upload_api_cb(evhtp_request_t *req, void *arg)
} else if (error->code == SEAF_ERR_FILES_WITH_SAME_NAME) {
error_code = -1;
send_error_reply (req, EVHTP_RES_BADREQ, "Too many files with same name.\n");
} else if (error->code == SEAF_ERR_GC_CONFLICT) {
error_code = -1;
send_error_reply (req, EVHTP_RES_CONFLICT, "GC Conflict.\n");
}
g_clear_error (&error);
}
@@ -811,6 +814,9 @@ upload_blks_api_cb(evhtp_request_t *req, void *arg)
error_code = ERROR_BLOCK_MISSING;
} else if (error->code == POST_FILE_ERR_QUOTA_FULL) {
error_code = ERROR_QUOTA;
} else if (error->code == SEAF_ERR_GC_CONFLICT) {
error_code = -1;
send_error_reply (req, EVHTP_RES_CONFLICT, "GC Conflict.\n");
}
g_clear_error (&error);
}
@@ -1243,6 +1249,9 @@ upload_ajax_cb(evhtp_request_t *req, void *arg)
} else if (error->code == SEAF_ERR_FILES_WITH_SAME_NAME) {
error_code = -1;
send_error_reply (req, EVHTP_RES_BADREQ, "Too many files with same name.\n");
} else if (error->code == SEAF_ERR_GC_CONFLICT) {
error_code = -1;
send_error_reply (req, EVHTP_RES_CONFLICT, "GC Conflict.\n");
}
g_clear_error (&error);
}
@@ -1527,6 +1536,9 @@ update_blks_api_cb(evhtp_request_t *req, void *arg)
error_code = ERROR_NOT_EXIST;
} else if (error->code == POST_FILE_ERR_QUOTA_FULL) {
error_code = ERROR_QUOTA;
} else if (error->code == SEAF_ERR_GC_CONFLICT) {
error_code = -1;
send_error_reply (req, EVHTP_RES_CONFLICT, "GC Conflict.\n");
}
g_clear_error (&error);
}
@@ -1788,6 +1800,9 @@ update_ajax_cb(evhtp_request_t *req, void *arg)
if (error) {
if (g_strcmp0 (error->message, "file does not exist") == 0) {
error_code = ERROR_NOT_EXIST;
} else if (error->code == SEAF_ERR_GC_CONFLICT) {
error_code = -1;
send_error_reply (req, EVHTP_RES_CONFLICT, "GC Conflict.\n");
}
g_clear_error (&error);
}