BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

fix deadlock
All checks were successful
BlockStorage/repertory_osx_builds/pipeline/head This commit looks good
Details
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2023-11-18 23:53:03 -06:00
parent ee415d2e4a
commit 983587aeb7
3 changed files with 139 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drives/fuse/fuse_drive.cpp
View File

@ -1250,6 +1250,7 @@ auto fuse_drive::truncate_impl(std::string api_path, off_t size) -> api_error {
res = open_file->resize(static_cast<std::uint64_t>(size));
}
fm_->close(handle);
return res;
}

31
src/file_manager/file_manager.cpp
View File

@ -318,27 +318,27 @@ auto file_manager::is_processing(const std::string &api_path) const -> bool {
return false;
}
recur_mutex_lock open_lock(open_file_mtx_);
mutex_lock upload_lock(upload_mtx_);
unique_mutex_lock upload_lock(upload_mtx_);
if (upload_lookup_.find(api_path) != upload_lookup_.end()) {
return true;
}
upload_lock.unlock();
{
auto iterator = std::unique_ptr<rocksdb::Iterator>(
db_->NewIterator(rocksdb::ReadOptions(), upload_family_));
for (iterator->SeekToFirst(); iterator->Valid(); iterator->Next()) {
const auto parts = utils::string::split(iterator->key().ToString(), ':');
if (parts[1u] == api_path) {
if (parts.at(1U) == api_path) {
return true;
}
}
}
auto it = open_file_lookup_.find(api_path);
if (it != open_file_lookup_.end()) {
return it->second->is_modified() || not it->second->is_complete();
recur_mutex_lock open_lock(open_file_mtx_);
auto iter = open_file_lookup_.find(api_path);
if (iter != open_file_lookup_.end()) {
return iter->second->is_modified() || not iter->second->is_complete();
}
return false;
@ -484,18 +484,18 @@ void file_manager::remove_upload(const std::string &api_path, bool no_lock) {
return;
}
std::unique_ptr<mutex_lock> l;
std::unique_ptr<mutex_lock> lock;
if (not no_lock) {
l = std::make_unique<mutex_lock>(upload_mtx_);
lock = std::make_unique<mutex_lock>(upload_mtx_);
}
auto it = upload_lookup_.find(api_path);
if (it == upload_lookup_.end()) {
auto iter = upload_lookup_.find(api_path);
if (iter == upload_lookup_.end()) {
auto iterator = std::unique_ptr<rocksdb::Iterator>(
db_->NewIterator(rocksdb::ReadOptions(), upload_family_));
for (iterator->SeekToFirst(); iterator->Valid(); iterator->Next()) {
const auto parts = utils::string::split(iterator->key().ToString(), ':');
if (parts[1U] == api_path) {
if (parts.at(1U) == api_path) {
if (db_->Delete(rocksdb::WriteOptions(), upload_family_,
iterator->key())
.ok()) {
@ -511,15 +511,15 @@ void file_manager::remove_upload(const std::string &api_path, bool no_lock) {
db_->NewIterator(rocksdb::ReadOptions(), upload_active_family_));
for (iterator->SeekToFirst(); iterator->Valid(); iterator->Next()) {
const auto parts = utils::string::split(iterator->key().ToString(), ':');
if (parts[1U] == api_path) {
if (parts.at(1U) == api_path) {
db_->Delete(rocksdb::WriteOptions(), upload_active_family_,
iterator->key());
}
}
event_system::instance().raise<file_upload_removed>(
api_path, it->second->get_source_path());
api_path, iter->second->get_source_path());
it->second->cancel();
iter->second->cancel();
upload_lookup_.erase(api_path);
}
@ -846,7 +846,6 @@ void file_manager::store_resume(const i_open_file &o) {
return;
}
recur_mutex_lock open_lock(open_file_mtx_);
const auto res = db_->Put(rocksdb::WriteOptions(), default_family_,
o.get_api_path(), create_resume_entry(o).dump());
if (res.ok()) {

232
tests/fuse_drive_test.cpp
View File

@ -519,7 +519,7 @@ static void test_xattr_removexattr(const std::string &file_path) {
TEST(fuse_drive, all_tests) {
auto current_directory = std::filesystem::current_path();
for (std::size_t idx = 0U; idx < 2U; idx++) {
for (std::size_t idx = 1U; idx < 2U; idx++) {
std::filesystem::current_path(current_directory);
const auto test_directory =
@ -587,116 +587,130 @@ TEST(fuse_drive, all_tests) {
std::this_thread::sleep_for(5s);
EXPECT_EQ(0, system(("mount|grep \"" + mount_location + "\"").c_str()));
auto file_path = create_file_and_test(mount_location, "chmod_test");
test_chmod(utils::path::create_api_path("chmod_test"), file_path);
unlink_file_and_test(file_path);
// auto file_path = create_file_and_test(mount_location, "chmod_test");
// test_chmod(utils::path::create_api_path("chmod_test"), file_path);
// unlink_file_and_test(file_path);
//
// file_path = create_file_and_test(mount_location, "chown_test");
// test_chown(utils::path::create_api_path("chown_test"), file_path);
// unlink_file_and_test(file_path);
//
// file_path = utils::path::combine(mount_location, {"mkdir_test"});
// test_mkdir(utils::path::create_api_path("mkdir_test"), file_path);
// rmdir_and_test(file_path);
//
// file_path = create_file_and_test(mount_location, "write_read_test");
// test_write_and_read(utils::path::create_api_path("write_read_test"),
// file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location, "from_rename_file_test");
// auto to_file_path = utils::path::absolute(
// utils::path::combine(mount_location, {"to_rename_file_test"}));
// test_rename_file(file_path, to_file_path,
// provider_ptr->is_rename_supported());
// EXPECT_TRUE(utils::file::retry_delete_file(file_path));
// EXPECT_TRUE(utils::file::retry_delete_file(to_file_path));
//
// file_path = utils::path::absolute(
// utils::path::combine(mount_location, {"from_rename_dir_test"}));
// to_file_path = utils::path::absolute(
// utils::path::combine(mount_location, {"to_rename_dir_test"}));
// test_rename_directory(file_path, to_file_path,
// provider_ptr->is_rename_supported());
// EXPECT_TRUE(utils::file::retry_delete_directory(file_path.c_str()));
// EXPECT_TRUE(utils::file::retry_delete_directory(to_file_path.c_str()));
file_path = create_file_and_test(mount_location, "chown_test");
test_chown(utils::path::create_api_path("chown_test"), file_path);
unlink_file_and_test(file_path);
while (true) {
auto file_path =
create_file_and_test(mount_location, "truncate_file_test");
test_truncate(file_path);
unlink_file_and_test(file_path);
}
file_path = utils::path::combine(mount_location, {"mkdir_test"});
test_mkdir(utils::path::create_api_path("mkdir_test"), file_path);
rmdir_and_test(file_path);
file_path = create_file_and_test(mount_location, "write_read_test");
test_write_and_read(utils::path::create_api_path("write_read_test"),
file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "from_rename_file_test");
auto to_file_path = utils::path::absolute(
utils::path::combine(mount_location, {"to_rename_file_test"}));
test_rename_file(file_path, to_file_path,
provider_ptr->is_rename_supported());
EXPECT_TRUE(utils::file::retry_delete_file(file_path));
EXPECT_TRUE(utils::file::retry_delete_file(to_file_path));
file_path = utils::path::absolute(
utils::path::combine(mount_location, {"from_rename_dir_test"}));
to_file_path = utils::path::absolute(
utils::path::combine(mount_location, {"to_rename_dir_test"}));
test_rename_directory(file_path, to_file_path,
provider_ptr->is_rename_supported());
EXPECT_TRUE(utils::file::retry_delete_directory(file_path.c_str()));
EXPECT_TRUE(utils::file::retry_delete_directory(to_file_path.c_str()));
file_path = create_file_and_test(mount_location, "truncate_file_test");
test_truncate(file_path);
unlink_file_and_test(file_path);
file_path = create_file_and_test(mount_location, "ftruncate_file_test");
test_ftruncate(file_path);
unlink_file_and_test(file_path);
#ifndef __APPLE__
file_path = create_file_and_test(mount_location, "fallocate_file_test");
test_fallocate(utils::path::create_api_path("fallocate_file_test"),
file_path);
unlink_file_and_test(file_path);
#endif
file_path = create_file_and_test(mount_location, "write_fails_ro_test");
test_write_operations_fail_if_read_only(
utils::path::create_api_path("write_fails_ro_test"), file_path);
unlink_file_and_test(file_path);
file_path = create_file_and_test(mount_location, "getattr.txt");
test_file_getattr(utils::path::create_api_path("getattr.txt"),
file_path);
unlink_file_and_test(file_path);
file_path = utils::path::combine(mount_location, {"getattr_dir"});
test_directory_getattr(utils::path::create_api_path("getattr_dir"),
file_path);
rmdir_and_test(file_path);
#if !__APPLE__ && HAS_SETXATTR
file_path =
create_file_and_test(mount_location, "xattr_invalid_names_test");
test_xattr_invalid_parameters(file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "xattr_create_get_test");
test_xattr_create_and_get(file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "xattr_listxattr_test");
test_xattr_listxattr(file_path);
unlink_file_and_test(file_path);
file_path = create_file_and_test(mount_location, "xattr_replace_test");
test_xattr_replace(file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "xattr_default_create_test");
test_xattr_default_create(file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "xattr_default_replace_test");
test_xattr_default_replace(file_path);
unlink_file_and_test(file_path);
file_path = create_file_and_test(mount_location,
"xattr_create_fails_exists_test");
test_xattr_create_fails_if_exists(file_path);
unlink_file_and_test(file_path);
file_path = create_file_and_test(mount_location,
"xattr_create_fails_not_exists_test");
test_xattr_create_fails_if_not_exists(file_path);
unlink_file_and_test(file_path);
file_path =
create_file_and_test(mount_location, "xattr_removexattr_test");
test_xattr_removexattr(file_path);
unlink_file_and_test(file_path);
#endif
// file_path = create_file_and_test(mount_location,
// "ftruncate_file_test"); test_ftruncate(file_path);
// unlink_file_and_test(file_path);
//
// #ifndef __APPLE__
// file_path = create_file_and_test(mount_location,
// "fallocate_file_test");
// test_fallocate(utils::path::create_api_path("fallocate_file_test"),
// file_path);
// unlink_file_and_test(file_path);
// #endif
//
// file_path = create_file_and_test(mount_location,
// "write_fails_ro_test");
// test_write_operations_fail_if_read_only(
// utils::path::create_api_path("write_fails_ro_test"),
// file_path);
// unlink_file_and_test(file_path);
//
// file_path = create_file_and_test(mount_location,
// "getattr.txt");
// test_file_getattr(utils::path::create_api_path("getattr.txt"),
// file_path);
// unlink_file_and_test(file_path);
//
// file_path = utils::path::combine(mount_location,
// {"getattr_dir"});
// test_directory_getattr(utils::path::create_api_path("getattr_dir"),
// file_path);
// rmdir_and_test(file_path);
//
// #if !__APPLE__ && HAS_SETXATTR
// file_path =
// create_file_and_test(mount_location,
// "xattr_invalid_names_test");
// test_xattr_invalid_parameters(file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location,
// "xattr_create_get_test");
// test_xattr_create_and_get(file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location,
// "xattr_listxattr_test");
// test_xattr_listxattr(file_path);
// unlink_file_and_test(file_path);
//
// file_path = create_file_and_test(mount_location,
// "xattr_replace_test"); test_xattr_replace(file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location,
// "xattr_default_create_test");
// test_xattr_default_create(file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location,
// "xattr_default_replace_test");
// test_xattr_default_replace(file_path);
// unlink_file_and_test(file_path);
//
// file_path = create_file_and_test(mount_location,
// "xattr_create_fails_exists_test");
// test_xattr_create_fails_if_exists(file_path);
// unlink_file_and_test(file_path);
//
// file_path = create_file_and_test(mount_location,
// "xattr_create_fails_not_exists_test");
// test_xattr_create_fails_if_not_exists(file_path);
// unlink_file_and_test(file_path);
//
// file_path =
// create_file_and_test(mount_location,
// "xattr_removexattr_test");
// test_xattr_removexattr(file_path);
// unlink_file_and_test(file_path);
// #endif
execute_unmount(mount_location);
});