aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/upstream/upstreamcache.cpp
diff options
context:
space:
mode:
authorzousar <[email protected]>2025-06-24 16:26:29 -0600
committerzousar <[email protected]>2025-06-24 16:26:29 -0600
commitbb298631ba35a323827dda0b8cd6158e276b5f61 (patch)
tree7ba8db91c44ce83f2c518f80f80ab14910eefa6f /src/zenserver/upstream/upstreamcache.cpp
parentChange to PutResult structure (diff)
parent5.6.14 (diff)
downloadzen-bb298631ba35a323827dda0b8cd6158e276b5f61.tar.xz
zen-bb298631ba35a323827dda0b8cd6158e276b5f61.zip
Merge branch 'main' into zs/put-overwrite-policy
Diffstat (limited to 'src/zenserver/upstream/upstreamcache.cpp')
-rw-r--r--src/zenserver/upstream/upstreamcache.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index e438a840a..744b861dd 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -134,7 +134,7 @@ namespace detail {
return {.State = UpstreamEndpointState::kOk};
}
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
const JupiterResult Result = Session.Authenticate();
if (Result.Success)
@@ -181,7 +181,7 @@ namespace detail {
try
{
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
JupiterResult Result;
std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
@@ -301,7 +301,7 @@ namespace detail {
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheRecords");
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
GetUpstreamCacheResult Result;
for (CacheKeyRequest* Request : Requests)
@@ -365,7 +365,7 @@ namespace detail {
try
{
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
const JupiterResult Result = Session.GetCompressedBlob(BlobStoreNamespace, ValueContentId);
@@ -398,7 +398,7 @@ namespace detail {
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheChunks");
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
GetUpstreamCacheResult Result;
for (CacheChunkRequest* RequestPtr : CacheChunkRequests)
@@ -453,7 +453,7 @@ namespace detail {
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheValues");
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
GetUpstreamCacheResult Result;
for (CacheValueRequest* RequestPtr : CacheValueRequests)
@@ -533,7 +533,7 @@ namespace detail {
try
{
- JupiterSession Session(m_Client->Logger(), m_Client->Client());
+ JupiterSession Session(m_Client->Logger(), m_Client->Client(), m_AllowRedirect);
if (CacheRecord.Type == ZenContentType::kBinary)
{
@@ -756,6 +756,7 @@ namespace detail {
UpstreamStatus m_Status;
UpstreamEndpointStats m_Stats;
RefPtr<JupiterClient> m_Client;
+ const bool m_AllowRedirect = false;
};
class ZenUpstreamEndpoint final : public UpstreamEndpoint