micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Add secret ability to specify zone

Browse Source
This commit is contained in:
Brian Picciano 2022-11-13 20:09:03 +01:00
parent da100c6170
commit 739e88d6c9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
entrypoint/src/cmd/entrypoint/garage_util.go
View File

@ -265,9 +265,14 @@ func garageApplyLayout(
id := bootstrapGarageHostForAlloc(thisHost, alloc).ID id := bootstrapGarageHostForAlloc(thisHost, alloc).ID
zone := hostName
if alloc.Zone != "" {
zone = alloc.Zone
}
clusterLayout[id] = peerLayout{ clusterLayout[id] = peerLayout{
Capacity: alloc.Capacity / 100, Capacity: alloc.Capacity / 100,
Zone: hostName, Zone: zone,
Tags: []string{}, Tags: []string{},
} }
} }

4
entrypoint/src/daemon/config.go
View File

@ -36,6 +36,10 @@ type ConfigStorageAllocation struct {
S3APIPort int `yaml:"s3_api_port"` S3APIPort int `yaml:"s3_api_port"`
RPCPort int `yaml:"rpc_port"` RPCPort int `yaml:"rpc_port"`
AdminPort int `yaml:"admin_port"` AdminPort int `yaml:"admin_port"`
// Zone is a secret option which makes it easier to test garage bugs, but
// which we don't want users to otherwise know about.
Zone string `yaml:"zone"`
} }
// Config describes the structure of the daemon config file. // Config describes the structure of the daemon config file.