X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4a2dc82a1acce855151928abe0030e1dd7dbf728..15623db9b12d8ac1b0b44a3eb53358896254b28a:/sdk/go/arvados/config.go diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 3539018556..e2e9907d5d 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -50,12 +50,39 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) { } } +type RequestLimits struct { + MaxItemsPerResponse int + MultiClusterRequestConcurrency int +} + type Cluster struct { 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 { @@ -134,6 +161,7 @@ func (cc *Cluster) GetNodeProfile(node string) (*NodeProfile, error) { 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"` @@ -151,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" @@ -165,13 +194,29 @@ func (np *NodeProfile) ServicePorts() map[ServiceName]string { 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 - TLS bool + Listen string + TLS bool + Insecure bool }