thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 01:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49415 from kssenii/fix-assertions

Browse Source 
Fix some assertions failing in stress test
This commit is contained in:
Kseniia Sumarokova 2023-05-03 11:45:33 +02:00 committed by GitHub
commit f5b6aa0fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Interpreters/Cache/FileSegment.cpp
View File

@ -56,6 +56,7 @@ FileSegment::FileSegment(
/// someone will _potentially_ want to download it (after calling getOrSetDownloader()).
case (State::EMPTY):
{
chassert(key_metadata.lock());
break;
}
/// DOWNLOADED is used either on initial cache metadata load into memory on server startup
@ -65,6 +66,7 @@ FileSegment::FileSegment(
reserved_size = downloaded_size = size_;
chassert(fs::file_size(getPathInLocalCache()) == size_);
chassert(queue_iterator);
chassert(key_metadata.lock());
break;
}
case (State::DETACHED):
@ -91,8 +93,16 @@ String FileSegment::getPathInLocalCache() const
return getKeyMetadata()->getFileSegmentPath(*this);
}
void FileSegment::setDownloadState(State state, const FileSegmentGuard::Lock &)
void FileSegment::setDownloadState(State state, const FileSegmentGuard::Lock & lock)
{
if (isCompleted(false) && state != State::DETACHED)
{
throw Exception(
ErrorCodes::LOGICAL_ERROR,
"Updating state to {} of file segment is not allowed, because it is already completed ({})",
stateToString(state), getInfoForLogUnlocked(lock));
}
LOG_TEST(log, "Updated state from {} to {}", stateToString(download_state), stateToString(state));
download_state = state;
}
@ -182,12 +192,13 @@ String FileSegment::getOrSetDownloader()
if (current_downloader.empty())
{
const auto caller_id = getCallerId();
bool allow_new_downloader = download_state == State::EMPTY || download_state == State::PARTIALLY_DOWNLOADED || !caller_id.starts_with("None");
bool allow_new_downloader = download_state == State::EMPTY || download_state == State::PARTIALLY_DOWNLOADED;
if (!allow_new_downloader)
return "notAllowed:" + stateToString(download_state);
current_downloader = downloader_id = caller_id;
setDownloadState(State::DOWNLOADING, lock);
chassert(key_metadata.lock());
}
return current_downloader;