Merge pull request #1476 from grafana/lower-chunk-cache-default

lower default max chunk cache size to 512MB
grafana · Sep 25, 2019 · a96c912 · a96c912
2 parents c6b8b70 + 25d4050
commit a96c912
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/docker/docker-chaos/metrictank.ini b/docker/docker-chaos/metrictank.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/docker/docker-cluster-query/metrictank.ini b/docker/docker-cluster-query/metrictank.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/docker/docker-cluster/metrictank.ini b/docker/docker-cluster/metrictank.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/docker/docker-dev-custom-cfg-kafka/metrictank.ini b/docker/docker-dev-custom-cfg-kafka/metrictank.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/docs/config.md b/docs/config.md
@@ -248,9 +248,9 @@ buffer-size = 20000
 
 ```
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 ```
 
 ## http api ##

diff --git a/mdata/cache/ccache.go b/mdata/cache/ccache.go
@@ -24,8 +24,8 @@ var (
 
 func init() {
 	flags := flag.NewFlagSet("chunk-cache", flag.ExitOnError)
-	// (1024 ^ 3) * 4 = 4294967296 = 4G
-	flags.Uint64Var(&maxSize, "max-size", 4294967296, "Maximum size of chunk cache in bytes. 0 disables cache")
+	// 512 MB = (1024 ^ 2) * 512 = 536870912
+	flags.Uint64Var(&maxSize, "max-size", 536870912, "Maximum size of chunk cache in bytes. 0 disables cache")
 	globalconf.Register("chunk-cache", flags, flag.ExitOnError)
 }
 

diff --git a/metrictank-sample.ini b/metrictank-sample.ini
@@ -205,9 +205,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/scripts/config/metrictank-docker.ini b/scripts/config/metrictank-docker.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]

diff --git a/scripts/config/metrictank-package.ini b/scripts/config/metrictank-package.ini
@@ -202,9 +202,9 @@ buffer-size = 20000
 
 ## chunk cache ##
 [chunk-cache]
-# maximum size of chunk cache in bytes. (1024 ^ 3) * 4 = 4294967296 = 4G
+# maximum size of chunk cache in bytes. 512 MB = (1024 ^ 2) * 512 = 536870912
 # 0 disables cache
-max-size = 4294967296
+max-size = 536870912
 
 ## http api ##
 [http]