Update slot definition and remove DuckDB driver cpuThreadRatio

rilldata · Jul 1, 2024 · 921948f · 921948f
1 parent df35d1d
commit 921948f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/admin/provisioner/kubernetes.go b/admin/provisioner/kubernetes.go
@@ -123,7 +123,7 @@ func (p *KubernetesProvisioner) Provision(ctx context.Context, opts *ProvisionOp
 		Names:        names,
 		Host:         strings.Split(host, "//")[1], // Remove protocol
 		CPU:          1 * opts.Slots,
-		MemoryGB:     2 * opts.Slots,
+		MemoryGB:     8 * opts.Slots,
 		StorageBytes: 40 * int64(opts.Slots) * int64(datasize.GB),
 		Slots:        opts.Slots,
 		Annotations:  opts.Annotations,

diff --git a/admin/provisioner/static.go b/admin/provisioner/static.go
@@ -72,7 +72,7 @@ func (p *StaticProvisioner) Provision(ctx context.Context, opts *ProvisionOption
 		Host:         target.Host,
 		Audience:     target.Audience,
 		CPU:          1 * opts.Slots,
-		MemoryGB:     2 * opts.Slots,
+		MemoryGB:     8 * opts.Slots,
 		StorageBytes: int64(opts.Slots) * 40 * int64(datasize.GB),
 	}, nil
 }

diff --git a/runtime/drivers/duckdb/config.go b/runtime/drivers/duckdb/config.go
@@ -11,9 +11,8 @@ import (
 )
 
 const (
-	cpuThreadRatio float64 = 0.5
-	poolSizeMin    int     = 2
-	poolSizeMax    int     = 5
+	poolSizeMin int = 2
+	poolSizeMax int = 5
 )
 
 // config represents the DuckDB driver config
@@ -104,7 +103,7 @@ func newConfig(cfgMap map[string]any) (*config, error) {
 	if cfg.ThreadsOverride != 0 {
 		threads = cfg.ThreadsOverride
 	} else if cfg.CPU > 0 {
-		threads = int(cpuThreadRatio * float64(cfg.CPU))
+		threads = cfg.CPU
 		if threads <= 0 {
 			threads = 1
 		}