From b2dfbabd044accb7e086977ea840fe18fcf28781 Mon Sep 17 00:00:00 2001
From: JinmingHu <jinmhu@microsoft.com>
Date: Tue, 25 Aug 2020 09:52:11 +0800
Subject: [PATCH] StoragePerRetryPolicy (#512)

---
 sdk/storage/CMakeLists.txt                                | 4 ++--
 ...rs_request_policy.hpp => storage_per_retry_policy.hpp} | 7 +++----
 sdk/storage/src/blobs/blob_client.cpp                     | 8 ++++----
 sdk/storage/src/blobs/blob_container_client.cpp           | 8 ++++----
 sdk/storage/src/blobs/blob_service_client.cpp             | 8 ++++----
 ...rs_request_policy.cpp => storage_per_retry_policy.cpp} | 4 ++--
 sdk/storage/src/datalake/datalake_directory_client.cpp    | 8 ++++----
 sdk/storage/src/datalake/datalake_file_client.cpp         | 8 ++++----
 sdk/storage/src/datalake/datalake_file_system_client.cpp  | 8 ++++----
 sdk/storage/src/datalake/datalake_path_client.cpp         | 8 ++++----
 sdk/storage/src/datalake/datalake_service_client.cpp      | 8 ++++----
 sdk/storage/src/shares/share_client.cpp                   | 8 ++++----
 sdk/storage/src/shares/share_service_client.cpp           | 8 ++++----
 13 files changed, 47 insertions(+), 48 deletions(-)
 rename sdk/storage/inc/common/{common_headers_request_policy.hpp => storage_per_retry_policy.hpp} (68%)
 rename sdk/storage/src/common/{common_headers_request_policy.cpp => storage_per_retry_policy.cpp} (91%)

diff --git a/sdk/storage/CMakeLists.txt b/sdk/storage/CMakeLists.txt
index e76600259..e4236f891 100644
--- a/sdk/storage/CMakeLists.txt
+++ b/sdk/storage/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 
 set(AZURE_STORAGE_COMMON_HEADER
     inc/common/access_conditions.hpp
-    inc/common/common_headers_request_policy.hpp
+    inc/common/storage_per_retry_policy.hpp
     inc/common/concurrent_transfer.hpp
     inc/common/constants.hpp
     inc/common/crypt.hpp
@@ -33,7 +33,7 @@ set(AZURE_STORAGE_COMMON_HEADER
 )
 
 set(AZURE_STORAGE_COMMON_SOURCE
-    src/common/common_headers_request_policy.cpp
+    src/common/storage_per_retry_policy.cpp
     src/common/crypt.cpp
     src/common/file_io.cpp
     src/common/reliable_stream.cpp
diff --git a/sdk/storage/inc/common/common_headers_request_policy.hpp b/sdk/storage/inc/common/storage_per_retry_policy.hpp
similarity index 68%
rename from sdk/storage/inc/common/common_headers_request_policy.hpp
rename to sdk/storage/inc/common/storage_per_retry_policy.hpp
index 723327ce3..758e191c4 100644
--- a/sdk/storage/inc/common/common_headers_request_policy.hpp
+++ b/sdk/storage/inc/common/storage_per_retry_policy.hpp
@@ -7,14 +7,13 @@
 
 namespace Azure { namespace Storage {
 
-  class CommonHeadersRequestPolicy : public Core::Http::HttpPolicy {
+  class StoragePerRetryPolicy : public Core::Http::HttpPolicy {
   public:
-    explicit CommonHeadersRequestPolicy() {}
-    ~CommonHeadersRequestPolicy() override {}
+    ~StoragePerRetryPolicy() override {}
 
     std::unique_ptr<HttpPolicy> Clone() const override
     {
-      return std::make_unique<CommonHeadersRequestPolicy>(*this);
+      return std::make_unique<StoragePerRetryPolicy>(*this);
     }
 
     std::unique_ptr<Core::Http::RawResponse> Send(
diff --git a/sdk/storage/src/blobs/blob_client.cpp b/sdk/storage/src/blobs/blob_client.cpp
index bf085e4b1..9bb449724 100644
--- a/sdk/storage/src/blobs/blob_client.cpp
+++ b/sdk/storage/src/blobs/blob_client.cpp
@@ -6,13 +6,13 @@
 #include "blobs/append_blob_client.hpp"
 #include "blobs/block_blob_client.hpp"
 #include "blobs/page_blob_client.hpp"
-#include "common/common_headers_request_policy.hpp"
 #include "common/concurrent_transfer.hpp"
 #include "common/constants.hpp"
 #include "common/file_io.hpp"
 #include "common/reliable_stream.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "http/curl/curl.hpp"
@@ -60,7 +60,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -87,7 +87,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Details::c_StorageScope));
@@ -114,7 +114,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/blobs/blob_container_client.cpp b/sdk/storage/src/blobs/blob_container_client.cpp
index 5509a16ee..c6acc3b22 100644
--- a/sdk/storage/src/blobs/blob_container_client.cpp
+++ b/sdk/storage/src/blobs/blob_container_client.cpp
@@ -6,10 +6,10 @@
 #include "blobs/append_blob_client.hpp"
 #include "blobs/block_blob_client.hpp"
 #include "blobs/page_blob_client.hpp"
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "http/curl/curl.hpp"
@@ -56,7 +56,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -83,7 +83,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Details::c_StorageScope));
@@ -112,7 +112,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/blobs/blob_service_client.cpp b/sdk/storage/src/blobs/blob_service_client.cpp
index 86e13e445..952bea1a1 100644
--- a/sdk/storage/src/blobs/blob_service_client.cpp
+++ b/sdk/storage/src/blobs/blob_service_client.cpp
@@ -3,10 +3,10 @@
 
 #include "blobs/blob_service_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "http/curl/curl.hpp"
@@ -51,7 +51,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -78,7 +78,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Details::c_StorageScope));
@@ -106,7 +106,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/common/common_headers_request_policy.cpp b/sdk/storage/src/common/storage_per_retry_policy.cpp
similarity index 91%
rename from sdk/storage/src/common/common_headers_request_policy.cpp
rename to sdk/storage/src/common/storage_per_retry_policy.cpp
index 876affeb1..9254e6acf 100644
--- a/sdk/storage/src/common/common_headers_request_policy.cpp
+++ b/sdk/storage/src/common/storage_per_retry_policy.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "common/common_headers_request_policy.hpp"
+#include "common/storage_per_retry_policy.hpp"
 
 #include <ctime>
 
 namespace Azure { namespace Storage {
 
-  std::unique_ptr<Core::Http::RawResponse> CommonHeadersRequestPolicy::Send(
+  std::unique_ptr<Core::Http::RawResponse> StoragePerRetryPolicy::Send(
       Core::Context const& ctx,
       Core::Http::Request& request,
       Core::Http::NextHttpPolicy nextHttpPolicy) const
diff --git a/sdk/storage/src/datalake/datalake_directory_client.cpp b/sdk/storage/src/datalake/datalake_directory_client.cpp
index 1f483f272..684bb6929 100644
--- a/sdk/storage/src/datalake/datalake_directory_client.cpp
+++ b/sdk/storage/src/datalake/datalake_directory_client.cpp
@@ -3,11 +3,11 @@
 
 #include "datalake/datalake_directory_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/crypt.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "datalake/datalake_file_client.hpp"
@@ -60,7 +60,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -113,7 +113,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/datalake/datalake_file_client.cpp b/sdk/storage/src/datalake/datalake_file_client.cpp
index 92445b112..0e445a778 100644
--- a/sdk/storage/src/datalake/datalake_file_client.cpp
+++ b/sdk/storage/src/datalake/datalake_file_client.cpp
@@ -3,11 +3,11 @@
 
 #include "datalake/datalake_file_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/crypt.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "datalake/datalake_utilities.hpp"
@@ -138,7 +138,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -165,7 +165,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -190,7 +190,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/datalake/datalake_file_system_client.cpp b/sdk/storage/src/datalake/datalake_file_system_client.cpp
index 1a15759fa..2a52d8312 100644
--- a/sdk/storage/src/datalake/datalake_file_system_client.cpp
+++ b/sdk/storage/src/datalake/datalake_file_system_client.cpp
@@ -4,11 +4,11 @@
 #include "datalake/datalake_file_system_client.hpp"
 
 #include "blobs/protocol/blob_rest_client.hpp"
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/crypt.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "datalake/datalake_directory_client.hpp"
@@ -79,7 +79,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -109,7 +109,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -139,7 +139,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/datalake/datalake_path_client.cpp b/sdk/storage/src/datalake/datalake_path_client.cpp
index 9a14ed378..da6c34e17 100644
--- a/sdk/storage/src/datalake/datalake_path_client.cpp
+++ b/sdk/storage/src/datalake/datalake_path_client.cpp
@@ -3,11 +3,11 @@
 
 #include "datalake/datalake_path_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/crypt.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "datalake/datalake_utilities.hpp"
@@ -119,7 +119,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -172,7 +172,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/datalake/datalake_service_client.cpp b/sdk/storage/src/datalake/datalake_service_client.cpp
index a73675edf..df5459639 100644
--- a/sdk/storage/src/datalake/datalake_service_client.cpp
+++ b/sdk/storage/src/datalake/datalake_service_client.cpp
@@ -4,11 +4,11 @@
 #include "datalake/datalake_service_client.hpp"
 
 #include "blobs/protocol/blob_rest_client.hpp"
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
 #include "common/storage_credential.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "datalake/datalake_file_system_client.hpp"
@@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -115,7 +115,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -142,7 +142,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/shares/share_client.cpp b/sdk/storage/src/shares/share_client.cpp
index 53c218ef0..2380dc0e0 100644
--- a/sdk/storage/src/shares/share_client.cpp
+++ b/sdk/storage/src/shares/share_client.cpp
@@ -3,11 +3,11 @@
 
 #include "shares/share_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/crypt.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "http/curl/curl.hpp"
@@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -79,7 +79,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -104,7 +104,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);
diff --git a/sdk/storage/src/shares/share_service_client.cpp b/sdk/storage/src/shares/share_service_client.cpp
index 788e8e928..abcb86506 100644
--- a/sdk/storage/src/shares/share_service_client.cpp
+++ b/sdk/storage/src/shares/share_service_client.cpp
@@ -3,11 +3,11 @@
 
 #include "shares/share_service_client.hpp"
 
-#include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
 #include "common/shared_key_policy.hpp"
 #include "common/storage_common.hpp"
 #include "common/storage_credential.hpp"
+#include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
 #include "http/curl/curl.hpp"
@@ -50,7 +50,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<SharedKeyPolicy>(credential));
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
@@ -76,7 +76,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(
         std::make_unique<Core::Credentials::Policy::BearerTokenAuthenticationPolicy>(
             credential, Azure::Storage::Details::c_StorageScope));
@@ -101,7 +101,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     {
       policies.emplace_back(p->Clone());
     }
-    policies.emplace_back(std::make_unique<CommonHeadersRequestPolicy>());
+    policies.emplace_back(std::make_unique<StoragePerRetryPolicy>());
     policies.emplace_back(std::make_unique<Azure::Core::Http::TransportPolicy>(
         std::make_shared<Azure::Core::Http::CurlTransport>()));
     m_pipeline = std::make_shared<Azure::Core::Http::HttpPipeline>(policies);