apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-14 01:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Azure backup cleanup

Browse Source
This commit is contained in:
sfc-gh-tclinkenbeard 2020-10-23 22:48:36 -07:00
parent e389a5dabe
commit 195ca30a20
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbclient/AsyncTaskThread.actor.cpp
View File

@ -27,7 +27,7 @@ namespace {
class TerminateTask final : public IAsyncTask {
public:
void operator()() override { ASSERT(false); }
bool isTerminate() const { return true; }
bool isTerminate() const override { return true; }
};
ACTOR Future<Void> asyncTaskThreadClient(AsyncTaskThread* asyncTaskThread, int* sum, int count) {
@ -56,8 +56,6 @@ AsyncTaskThread::~AsyncTaskThread() {
if (wakeUp) {
cv.notify_one();
}
// Warning: This destructor can hang if a task hangs, so it is
// up to the caller to prevent tasks from hanging indefinitely
thread.join();
}

2
fdbclient/CMakeLists.txt
View File

@ -140,7 +140,7 @@ endif()
add_flow_target(STATIC_LIBRARY NAME fdbclient SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs})
add_dependencies(fdbclient fdboptions)
if(BUILD_AZURE_BACKUP)
target_link_libraries(fdbclient PUBLIC fdbrpc curl uuid azure-storage-lite)
target_link_libraries(fdbclient PUBLIC fdbrpc PRIVATE curl uuid azure-storage-lite)
else()
target_link_libraries(fdbclient PUBLIC fdbrpc)
endif()