SNOW 162610: Do not use thread pool when parallel=1 (#213)

* Do not use thread pool when parallel=1 * Version bump to test with ODBC driver Co-authored-by: Harry Xi <[email protected]>
snowflakedb · Jun 29, 2020 · d1af142 · d1af142
1 parent d8dc254
commit d1af142
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/cpp/FileTransferAgent.cpp b/cpp/FileTransferAgent.cpp
@@ -248,6 +248,30 @@ void Snowflake::Client::FileTransferAgent::uploadFilesInParallel(std::string *co
     FileMetadata * metadata = &m_smallFilesMeta[i];
     m_executionResults->SetFileMetadata(&m_smallFilesMeta[i], resultIndex);
     metadata->overWrite = response.overwrite;
+
+    // workaround for incident 00212627
+    // Do not use thread pool when parallel = 1
+    if ((unsigned int)response.parallel <= 1)
+    {
+      do
+      {
+        RemoteStorageRequestOutcome outcome = uploadSingleFile(m_storageClient, metadata,
+          resultIndex);
+        if (outcome == RemoteStorageRequestOutcome::TOKEN_EXPIRED)
+        {
+          _mutex_lock(&m_parallelTokRenewMutex);
+          this->renewToken(command);
+          _mutex_unlock(&m_parallelTokRenewMutex);
+        }
+        else
+        {
+          break;
+        }
+      } while (true);
+
+      continue;
+    }
+
     tp.AddJob([metadata, resultIndex, command, this]()->void {
         do
         {
@@ -482,6 +506,30 @@ void Snowflake::Client::FileTransferAgent::downloadFilesInParallel(std::string *
     size_t resultIndex = i + m_largeFilesMeta.size();
     FileMetadata * metadata = &m_smallFilesMeta[i];
     m_executionResults->SetFileMetadata(&m_smallFilesMeta[i], resultIndex);
+
+    // workaround for incident 00212627
+    // Do not use thread pool when parallel = 1
+    if ((unsigned int)response.parallel <= 1)
+    {
+      do
+      {
+        RemoteStorageRequestOutcome outcome = downloadSingleFile(m_storageClient, metadata,
+          resultIndex);
+        if (outcome == RemoteStorageRequestOutcome::TOKEN_EXPIRED)
+        {
+          _mutex_lock(&m_parallelTokRenewMutex);
+          this->renewToken(command);
+          _mutex_unlock(&m_parallelTokRenewMutex);
+        }
+        else
+        {
+          break;
+        }
+      } while (true);
+
+      continue;
+    }
+
     tp.AddJob([metadata, resultIndex, command, this]()->void {
         do
         {

diff --git a/include/snowflake/version.h b/include/snowflake/version.h
@@ -5,6 +5,6 @@
 #ifndef SNOWFLAKE_CLIENT_VERSION_H
 #define SNOWFLAKE_CLIENT_VERSION_H
 
-#define SF_API_VERSION "0.5.1"
+#define SF_API_VERSION "0.5.3"
 
 #endif /* SNOWFLAKE_CLIENT_VERSION_H */