octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-06-06 02:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug about rename existing file of different sizes by mpcopy

Browse Source
This commit is contained in:
Takeshi Nakatani 2021-06-25 14:14:53 +00:00 committed by Andrew Gaul
parent a5c1915772
commit f9e80f995d
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fdcache_entity.cpp
View File

@ -1751,7 +1751,7 @@ bool FdEntity::MergeOrgMeta(headers_t& updatemeta)
}
// global function in s3fs.cpp
int put_headers(const char* path, headers_t& meta, bool is_copy);
int put_headers(const char* path, headers_t& meta, bool is_copy, bool use_st_size = true);
int FdEntity::UploadPendingMeta()
{

20
src/s3fs.cpp
View File

@ -107,7 +107,7 @@ static const std::string aws_secretkey = "AWSSecretKey";
//-------------------------------------------------------------------
// Global functions : prototype
//-------------------------------------------------------------------
int put_headers(const char* path, headers_t& meta, bool is_copy); // [NOTE] global function because this is called from FdEntity class
int put_headers(const char* path, headers_t& meta, bool is_copy, bool use_st_size = true); // [NOTE] global function because this is called from FdEntity class
//-------------------------------------------------------------------
// Static functions : prototype
@ -736,21 +736,27 @@ static int get_local_fent(AutoFdEntity& autoent, FdEntity **entity, const char*
// ow_sse_flg is for over writing sse header by use_sse option.
// @return fuse return code
//
int put_headers(const char* path, headers_t& meta, bool is_copy)
int put_headers(const char* path, headers_t& meta, bool is_copy, bool use_st_size)
{
int result;
S3fsCurl s3fscurl(true);
struct stat buf;
off_t size;
S3FS_PRN_INFO2("[path=%s]", path);
// files larger than 5GB must be modified via the multipart interface
// *** If there is not target object(a case of move command),
// get_object_attribute() returns error with initializing buf.
(void)get_object_attribute(path, &buf);
if(use_st_size){
struct stat buf;
(void)get_object_attribute(path, &buf);
size = buf.st_size;
}else{
size = get_size(meta);
}
if(!nocopyapi && !nomultipart && buf.st_size >= multipart_threshold){
if(0 != (result = s3fscurl.MultipartHeadRequest(path, buf.st_size, meta, is_copy))){
if(!nocopyapi && !nomultipart && size >= multipart_threshold){
if(0 != (result = s3fscurl.MultipartHeadRequest(path, size, meta, is_copy))){
return result;
}
}else{
@ -1288,7 +1294,7 @@ static int rename_object(const char* from, const char* to, bool update_ctime)
}
// copy
if(0 != (result = put_headers(to, meta, true))){
if(0 != (result = put_headers(to, meta, true, /* use_st_size= */ false))){
return result;
}

14
test/integration-test-main.sh
View File

@ -139,6 +139,19 @@ function test_mv_file {
rm_test_file $ALT_TEST_TEXT_FILE
}
function test_mv_to_exist_file {
describe "Testing mv file to exist file function ..."
BIG_MV_FILE_BLOCK_SIZE=$((BIG_FILE_BLOCK_SIZE + 1))
dd if=/dev/urandom of="${BIG_FILE}" bs=${BIG_FILE_BLOCK_SIZE} count=${BIG_FILE_COUNT}
dd if=/dev/urandom of="${BIG_FILE}-mv" bs=${BIG_MV_FILE_BLOCK_SIZE} count=${BIG_FILE_COUNT}
mv ${BIG_FILE} ${BIG_FILE}-mv
rm_test_file "${BIG_FILE}-mv"
}
function test_mv_empty_directory {
describe "Testing mv directory function ..."
if [ -e $TEST_DIR ]; then
@ -1459,6 +1472,7 @@ function add_all_tests {
add_tests test_truncate_upload
add_tests test_truncate_empty_file
add_tests test_mv_file
add_tests test_mv_to_exist_file
add_tests test_mv_empty_directory
add_tests test_mv_nonempty_directory
add_tests test_redirects