Change default limit-overwrite behavior to true

4 files changed, 7 insertions, 6 deletions

diff --git a/src/zenserver-test/cache-tests.cpp b/src/zenserver-test/cache-tests.cpp
index b8f73618b..8d50df0e6 100644
--- a/src/zenserver-test/cache-tests.cpp
+++ b/src/zenserver-test/cache-tests.cpp
@@ -881,11 +881,12 @@ TEST_CASE("zcache.rpc")
 	{
 		using namespace utils;
 
-		ZenConfig		  UpstreamCfg = ZenConfig::New(TestEnv.GetNewPortNumber());
+		ZenConfig		  UpstreamCfg = ZenConfig::New(TestEnv.GetNewPortNumber(), "--cache-bucket-limit-overwrites=false");
 		ZenServerInstance UpstreamServer(TestEnv);
 		SpawnServer(UpstreamServer, UpstreamCfg);
 
-		ZenConfig		  LocalCfg = ZenConfig::NewWithUpstream(TestEnv.GetNewPortNumber(), UpstreamCfg.Port);
+		ZenConfig LocalCfg =
+			ZenConfig::NewWithUpstream(TestEnv.GetNewPortNumber(), UpstreamCfg.Port, "--cache-bucket-limit-overwrites=false");
 		ZenServerInstance LocalServer(TestEnv);
 		SpawnServer(LocalServer, LocalCfg);
 
@@ -1030,7 +1031,7 @@ TEST_CASE("zcache.rpc")
 	{
 		using namespace utils;
 
-		ZenConfig		  UpstreamCfg = ZenConfig::New(TestEnv.GetNewPortNumber());
+		ZenConfig		  UpstreamCfg = ZenConfig::New(TestEnv.GetNewPortNumber(), "--cache-bucket-limit-overwrites=false");
 		ZenServerInstance UpstreamServer(TestEnv);
 		SpawnServer(UpstreamServer, UpstreamCfg);
 
diff --git a/src/zenserver/storage/storageconfig.cpp b/src/zenserver/storage/storageconfig.cpp
index 3a41ad003..0f8ab1e98 100644
--- a/src/zenserver/storage/storageconfig.cpp
+++ b/src/zenserver/storage/storageconfig.cpp
@@ -832,7 +832,7 @@ ZenStorageServerCmdLineOptions::AddCacheOptions(cxxopts::Options& options, ZenSt
 					   "",
 					   "cache-bucket-limit-overwrites",
 					   "Whether to require policy flag pattern before allowing overwrites in cache bucket",
-					   cxxopts::value<bool>(ServerOptions.StructuredCacheConfig.BucketConfig.LimitOverwrites)->default_value("false"),
+					   cxxopts::value<bool>(ServerOptions.StructuredCacheConfig.BucketConfig.LimitOverwrites)->default_value("true"),
 					   "");
 }
 
diff --git a/src/zenserver/storage/storageconfig.h b/src/zenserver/storage/storageconfig.h
index acdaa099b..d59d05cf6 100644
--- a/src/zenserver/storage/storageconfig.h
+++ b/src/zenserver/storage/storageconfig.h
@@ -111,7 +111,7 @@ struct ZenStructuredCacheBucketConfig
 	uint32_t PayloadAlignment	   = 1u << 4;
 	uint64_t MemCacheSizeThreshold = 1 * 1024;
 	uint64_t LargeObjectThreshold  = 128 * 1024;
-	bool	 LimitOverwrites	   = false;
+	bool	 LimitOverwrites	   = true;
 };
 
 struct ZenStructuredCacheConfig
diff --git a/src/zenstore/include/zenstore/cache/cachedisklayer.h b/src/zenstore/include/zenstore/cache/cachedisklayer.h
index ef2781c1a..3d684587d 100644
--- a/src/zenstore/include/zenstore/cache/cachedisklayer.h
+++ b/src/zenstore/include/zenstore/cache/cachedisklayer.h
@@ -122,7 +122,7 @@ public:
 		uint32_t PayloadAlignment	   = 1u << 4;
 		uint64_t MemCacheSizeThreshold = 1 * 1024;
 		uint64_t LargeObjectThreshold  = 128 * 1024;
-		bool	 LimitOverwrites	   = false;
+		bool	 LimitOverwrites	   = true;
 	};
 
 	struct Configuration