X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8f76037ba8a37c488612285ffe70d26d0d038124..15623db9b12d8ac1b0b44a3eb53358896254b28a:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 875a274dc6..e2e9907d5d 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -5,6 +5,8 @@
 package arvados
 
 import (
+	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 
@@ -48,50 +50,118 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 	}
 }
 
+type RequestLimits struct {
+	MaxItemsPerResponse            int
+	MultiClusterRequestConcurrency int
+}
+
 type Cluster struct {
-	ClusterID       string `json:"-"`
-	ManagementToken string
-	SystemNodes     map[string]SystemNode
-	InstanceTypes   []InstanceType
+	ClusterID          string `json:"-"`
+	ManagementToken    string
+	NodeProfiles       map[string]NodeProfile
+	InstanceTypes      InstanceTypeMap
+	HTTPRequestTimeout Duration
+	RemoteClusters     map[string]RemoteCluster
+	PostgreSQL         PostgreSQL
+	RequestLimits      RequestLimits
+}
+
+type PostgreSQL struct {
+	Connection     PostgreSQLConnection
+	ConnectionPool int
+}
+
+type PostgreSQLConnection map[string]string
+
+type RemoteCluster struct {
+	// API endpoint host or host:port; default is {id}.arvadosapi.com
+	Host string
+	// Perform a proxy request when a local client requests an
+	// object belonging to this remote.
+	Proxy bool
+	// Scheme, default "https". Can be set to "http" for testing.
+	Scheme string
+	// Disable TLS verify. Can be set to true for testing.
+	Insecure bool
 }
 
 type InstanceType struct {
 	Name         string
 	ProviderType string
 	VCPUs        int
-	RAM          int64
-	Scratch      int64
+	RAM          ByteSize
+	Scratch      ByteSize
 	Price        float64
+	Preemptible  bool
 }
 
-// GetThisSystemNode returns a SystemNode for the node we're running
-// on right now.
-func (cc *Cluster) GetThisSystemNode() (*SystemNode, error) {
-	hostname, err := os.Hostname()
+type InstanceTypeMap map[string]InstanceType
+
+var errDuplicateInstanceTypeName = errors.New("duplicate instance type name")
+
+// UnmarshalJSON handles old config files that provide an array of
+// instance types instead of a hash.
+func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
+	if len(data) > 0 && data[0] == '[' {
+		var arr []InstanceType
+		err := json.Unmarshal(data, &arr)
+		if err != nil {
+			return err
+		}
+		if len(arr) == 0 {
+			*it = nil
+			return nil
+		}
+		*it = make(map[string]InstanceType, len(arr))
+		for _, t := range arr {
+			if _, ok := (*it)[t.Name]; ok {
+				return errDuplicateInstanceTypeName
+			}
+			(*it)[t.Name] = t
+		}
+		return nil
+	}
+	var hash map[string]InstanceType
+	err := json.Unmarshal(data, &hash)
 	if err != nil {
-		return nil, err
+		return err
+	}
+	// Fill in Name field using hash key.
+	*it = InstanceTypeMap(hash)
+	for name, t := range *it {
+		t.Name = name
+		(*it)[name] = t
 	}
-	return cc.GetSystemNode(hostname)
+	return nil
 }
 
-// GetSystemNode returns a SystemNode for the given hostname. An error
-// is returned if the appropriate configuration can't be determined
-// (e.g., this does not appear to be a system node).
-func (cc *Cluster) GetSystemNode(node string) (*SystemNode, error) {
-	if cfg, ok := cc.SystemNodes[node]; ok {
+// GetNodeProfile returns a NodeProfile for the given hostname. An
+// error is returned if the appropriate configuration can't be
+// determined (e.g., this does not appear to be a system node). If
+// node is empty, use the OS-reported hostname.
+func (cc *Cluster) GetNodeProfile(node string) (*NodeProfile, error) {
+	if node == "" {
+		hostname, err := os.Hostname()
+		if err != nil {
+			return nil, err
+		}
+		node = hostname
+	}
+	if cfg, ok := cc.NodeProfiles[node]; ok {
 		return &cfg, nil
 	}
 	// If node is not listed, but "*" gives a default system node
 	// config, use the default config.
-	if cfg, ok := cc.SystemNodes["*"]; ok {
+	if cfg, ok := cc.NodeProfiles["*"]; ok {
 		return &cfg, nil
 	}
 	return nil, fmt.Errorf("config does not provision host %q as a system node", node)
 }
 
-type SystemNode struct {
+type NodeProfile struct {
 	Controller  SystemServiceInstance `json:"arvados-controller"`
 	Health      SystemServiceInstance `json:"arvados-health"`
+	Keepbalance SystemServiceInstance `json:"keep-balance"`
 	Keepproxy   SystemServiceInstance `json:"keepproxy"`
 	Keepstore   SystemServiceInstance `json:"keepstore"`
 	Keepweb     SystemServiceInstance `json:"keep-web"`
@@ -109,6 +179,7 @@ const (
 	ServiceNameNodemanager ServiceName = "arvados-node-manager"
 	ServiceNameWorkbench   ServiceName = "arvados-workbench"
 	ServiceNameWebsocket   ServiceName = "arvados-ws"
+	ServiceNameKeepbalance ServiceName = "keep-balance"
 	ServiceNameKeepweb     ServiceName = "keep-web"
 	ServiceNameKeepproxy   ServiceName = "keepproxy"
 	ServiceNameKeepstore   ServiceName = "keepstore"
@@ -116,19 +187,36 @@ const (
 
 // ServicePorts returns the configured listening address (or "" if
 // disabled) for each service on the node.
-func (sn *SystemNode) ServicePorts() map[ServiceName]string {
+func (np *NodeProfile) ServicePorts() map[ServiceName]string {
 	return map[ServiceName]string{
-		ServiceNameRailsAPI:    sn.RailsAPI.Listen,
-		ServiceNameController:  sn.Controller.Listen,
-		ServiceNameNodemanager: sn.Nodemanager.Listen,
-		ServiceNameWorkbench:   sn.Workbench.Listen,
-		ServiceNameWebsocket:   sn.Websocket.Listen,
-		ServiceNameKeepweb:     sn.Keepweb.Listen,
-		ServiceNameKeepproxy:   sn.Keepproxy.Listen,
-		ServiceNameKeepstore:   sn.Keepstore.Listen,
+		ServiceNameRailsAPI:    np.RailsAPI.Listen,
+		ServiceNameController:  np.Controller.Listen,
+		ServiceNameNodemanager: np.Nodemanager.Listen,
+		ServiceNameWorkbench:   np.Workbench.Listen,
+		ServiceNameWebsocket:   np.Websocket.Listen,
+		ServiceNameKeepbalance: np.Keepbalance.Listen,
+		ServiceNameKeepweb:     np.Keepweb.Listen,
+		ServiceNameKeepproxy:   np.Keepproxy.Listen,
+		ServiceNameKeepstore:   np.Keepstore.Listen,
+	}
+}
+
+func (h RequestLimits) GetMultiClusterRequestConcurrency() int {
+	if h.MultiClusterRequestConcurrency == 0 {
+		return 4
+	}
+	return h.MultiClusterRequestConcurrency
+}
+
+func (h RequestLimits) GetMaxItemsPerResponse() int {
+	if h.MaxItemsPerResponse == 0 {
+		return 1000
 	}
+	return h.MaxItemsPerResponse
 }
 
 type SystemServiceInstance struct {
-	Listen string
+	Listen   string
+	TLS      bool
+	Insecure bool
 }