From 195ca30a2075441481d480bf61e1785c5dacbf09 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Fri, 23 Oct 2020 22:48:36 -0700
Subject: [PATCH] Azure backup cleanup
---
fdbclient/AsyncTaskThread.actor.cpp | 4 +---
fdbclient/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fdbclient/AsyncTaskThread.actor.cpp b/fdbclient/AsyncTaskThread.actor.cpp
index 50ff9f9a47..2e7c6e3596 100644
--- a/fdbclient/AsyncTaskThread.actor.cpp
+++ b/fdbclient/AsyncTaskThread.actor.cpp
@@ -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();
}
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 18d4fa4612..b51d7498ed 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -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()