Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TOML_KEY_ENVVAR: Dict[str, Dict[str, str]] = {
# Datafusion
"num-datafusion-threads": "INFLUXDB3_DATAFUSION_NUM_THREADS",
# IO
"num-io-threads": "INFLUXDB3_IO_NUM_THREADS",
"num-io-threads": "INFLUXDB3_NUM_IO_THREADS",
# Object storage
"data-dir": "INFLUXDB3_DB_DIR",
# AWS (AWS_ prefix, not INFLUXDB3_)
Expand Down Expand Up @@ -114,14 +114,14 @@ TOML_KEY_ENVVAR: Dict[str, Dict[str, str]] = {
"compaction-multipliers": "INFLUXDB3_ENTERPRISE_COMPACTION_MULTIPLIERS",
"compaction-row-limit": "INFLUXDB3_ENTERPRISE_COMPACTION_ROW_LIMIT",
# Last Value & Distinct Value Caches
"preemptive-cache-age": "INFLUXDB3_ENTERPRISE_PREEMPTIVE_CACHE_AGE",
"preemptive-cache-age": "INFLUXDB3_PREEMPTIVE_CACHE_AGE",
# Licensing
"license-email": "INFLUXDB3_ENTERPRISE_LICENSE_EMAIL",
"license-file": "INFLUXDB3_ENTERPRISE_LICENSE_FILE",
"license-type": "INFLUXDB3_ENTERPRISE_LICENSE_TYPE",
# Resource limits
"catalog-sync-interval": "INFLUXDB3_ENTERPRISE_CATALOG_SYNC_INTERVAL",
"max-columns": "INFLUXDB3_ENTERPRISE_PACHA_TREE_MAX_COLUMNS",
"max-columns": "INFLUXDB3_MAX_TOTAL_COLUMNS",
"num-database-limit": "INFLUXDB3_ENTERPRISE_NUM_DATABASE_LIMIT",
"num-table-limit": "INFLUXDB3_ENTERPRISE_NUM_TABLE_LIMIT",
"num-total-columns-per-table-limit": "INFLUXDB3_ENTERPRISE_NUM_TOTAL_COLUMNS_PER_TABLE_LIMIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@
# =============================================================================

# Maximum size of HTTP requests
# Default: 10485760 (10 MB) (env: INFLUXDB3_MAX_HTTP_REQUEST_SIZE)
#max-http-request-size="10485760"
# Default: 10mb (env: INFLUXDB3_MAX_HTTP_REQUEST_SIZE)
#max-http-request-size="10mb"

# =============================================================================
# Memory Management
Expand All @@ -339,8 +339,8 @@
#exec-mem-pool-size="20%"

# Internal buffer threshold
# Default: 50% (env: INFLUXDB3_FORCE_SNAPSHOT_MEM_THRESHOLD)
#force-snapshot-mem-threshold="50%"
# Default: 50% (env: INFLUXDB3_FORCE_SNAPSHOT_MEM_SIZE)
#force-snapshot-mem-size="50%"

# In-memory Parquet cache size
# Default: 20% (env: INFLUXDB3_FILE_CACHE_SIZE)
Expand Down Expand Up @@ -429,7 +429,7 @@
# =============================================================================

# Number of IO runtime threads
# Default: Auto-determined (env: INFLUXDB3_IO_NUM_THREADS)
# Default: Auto-determined (env: INFLUXDB3_NUM_IO_THREADS)
#num-io-threads="<N>"

# IO runtime type. Possible values: current-thread, multi-thread, multi-thread-alt
Expand Down
26 changes: 26 additions & 0 deletions .circleci/packages/test_influxdb3-launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ def test_core_flavor_mappings(self):
'object-store = "file"\n'
'http-bind = "0.0.0.0:8086"\n'
'virtual-env-location = "/path/to/venv"\n'
"num-io-threads = 4\n"
)
env_vars = self.launcher.read_config_toml(config_path, "core")
self.assertEqual(
Expand All @@ -313,6 +314,9 @@ def test_core_flavor_mappings(self):
"INFLUXDB3_OBJECT_STORE": "file",
"INFLUXDB3_HTTP_BIND_ADDR": "0.0.0.0:8086",
"VIRTUAL_ENV": "/path/to/venv",
# Must match the env var the binary actually reads
# (INFLUXDB3_NUM_IO_THREADS, not INFLUXDB3_IO_NUM_THREADS).
"INFLUXDB3_NUM_IO_THREADS": "4",
},
)

Expand All @@ -335,6 +339,28 @@ def test_enterprise_flavor_mappings(self):
},
)

def test_enterprise_engine_mappings(self):
"""Keys whose env vars do not follow the generic pattern must map to
names the current binary actually reads."""
config_path = self._write_toml_config(
'object-store = "file"\n'
'license-file = "/path/to/license.jwt"\n'
"max-columns = 1000000\n"
'preemptive-cache-age = "3d"\n'
)
env_vars = self.launcher.read_config_toml(config_path, "enterprise")
self.assertEqual(
env_vars,
{
"INFLUXDB3_OBJECT_STORE": "file",
"INFLUXDB3_ENTERPRISE_LICENSE_FILE": "/path/to/license.jwt",
# --max-total-columns; historic TOML key kept for compatibility
"INFLUXDB3_MAX_TOTAL_COLUMNS": "1000000",
# --preemptive-cache-age was never ENTERPRISE_-prefixed
"INFLUXDB3_PREEMPTIVE_CACHE_AGE": "3d",
},
)

def test_default_key_transformation(self):
"""Test default key transformation (dashes to underscores, uppercase, INFLUXDB3_ prefix)"""
config_path = self._write_toml_config(
Expand Down
37 changes: 37 additions & 0 deletions BUILDER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Build influxdb3 with Jemalloc 16
## Multiarch build
```bash
docker buildx bake img
docker import -i ./artifacts/influxdb3-multiarch.tar
```

## ARM64 only build
```bash
docker buildx bake img-arm64
docker import -i ./artifacts/influxdb3-arm64.tar
```

## CentOS10 docker-ce on WSL2
To avoid segmentation error during build, memory has to be preallocated:
.wslconfig
```
[wsl2]
neworkingMode=mirrored
dnsTunneling=true
firewall=true
memory=26GB
processors=13
swap=4GB
```





```bash
wsl
docker buildx create --name multibuilder --driver docker-container --buildkitd-config ./buildkitd.toml --use
```

## MacOS
brew install --cask docker
Loading