X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/aec1081434d75a6bb73baf096139d1d214dd1f47..927524f1be454de021180b74999d682780b8cb6b:/lib/controller/localdb/conn.go diff --git a/lib/controller/localdb/conn.go b/lib/controller/localdb/conn.go index 04f85cb5a9..323e660c6f 100644 --- a/lib/controller/localdb/conn.go +++ b/lib/controller/localdb/conn.go @@ -6,26 +6,37 @@ package localdb import ( "context" + "encoding/json" "fmt" + "net/http" + "os" "strings" + "time" "git.arvados.org/arvados.git/lib/controller/railsproxy" "git.arvados.org/arvados.git/lib/controller/rpc" "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/httpserver" + "github.com/sirupsen/logrus" ) type railsProxy = rpc.Conn type Conn struct { - cluster *arvados.Cluster - *railsProxy // handles API methods that aren't defined on Conn itself + cluster *arvados.Cluster + *railsProxy // handles API methods that aren't defined on Conn itself + vocabularyCache *arvados.Vocabulary + vocabularyFileModTime time.Time + lastVocabularyRefreshCheck time.Time + lastVocabularyError error loginController } func NewConn(cluster *arvados.Cluster) *Conn { railsProxy := railsproxy.NewConn(cluster) - var conn Conn - conn = Conn{ + railsProxy.RedactHostInErrors = true + conn := Conn{ cluster: cluster, railsProxy: railsProxy, } @@ -33,6 +44,106 @@ func NewConn(cluster *arvados.Cluster) *Conn { return &conn } +func (conn *Conn) checkProperties(ctx context.Context, properties interface{}) error { + if properties == nil { + return nil + } + var props map[string]interface{} + switch properties := properties.(type) { + case string: + err := json.Unmarshal([]byte(properties), &props) + if err != nil { + return err + } + case map[string]interface{}: + props = properties + default: + return fmt.Errorf("unexpected properties type %T", properties) + } + voc, err := conn.VocabularyGet(ctx) + if err != nil { + return err + } + err = voc.Check(props) + if err != nil { + return httpErrorf(http.StatusBadRequest, voc.Check(props).Error()) + } + return nil +} + +func (conn *Conn) maybeRefreshVocabularyCache(logger logrus.FieldLogger) error { + if conn.lastVocabularyRefreshCheck.Add(time.Second).After(time.Now()) { + // Throttle the access to disk to at most once per second. + return nil + } + conn.lastVocabularyRefreshCheck = time.Now() + fi, err := os.Stat(conn.cluster.API.VocabularyPath) + if err != nil { + err = fmt.Errorf("couldn't stat vocabulary file %q: %v", conn.cluster.API.VocabularyPath, err) + conn.lastVocabularyError = err + return err + } + if fi.ModTime().After(conn.vocabularyFileModTime) { + err = conn.loadVocabularyFile() + if err != nil { + conn.lastVocabularyError = err + return err + } + conn.vocabularyFileModTime = fi.ModTime() + conn.lastVocabularyError = nil + logger.Info("vocabulary file reloaded successfully") + } + return nil +} + +func (conn *Conn) loadVocabularyFile() error { + vf, err := os.ReadFile(conn.cluster.API.VocabularyPath) + if err != nil { + return fmt.Errorf("couldn't reading the vocabulary file: %v", err) + } + mk := make([]string, 0, len(conn.cluster.Collections.ManagedProperties)) + for k := range conn.cluster.Collections.ManagedProperties { + mk = append(mk, k) + } + voc, err := arvados.NewVocabulary(vf, mk) + if err != nil { + return fmt.Errorf("while loading vocabulary file %q: %s", conn.cluster.API.VocabularyPath, err) + } + conn.vocabularyCache = voc + return nil +} + +// LastVocabularyError returns the last error encountered while loading the +// vocabulary file. +// Implements health.Func +func (conn *Conn) LastVocabularyError() error { + conn.maybeRefreshVocabularyCache(ctxlog.FromContext(context.Background())) + return conn.lastVocabularyError +} + +// VocabularyGet refreshes the vocabulary cache if necessary and returns it. +func (conn *Conn) VocabularyGet(ctx context.Context) (arvados.Vocabulary, error) { + if conn.cluster.API.VocabularyPath == "" { + return arvados.Vocabulary{ + Tags: map[string]arvados.VocabularyTag{}, + }, nil + } + logger := ctxlog.FromContext(ctx) + if conn.vocabularyCache == nil { + // Initial load of vocabulary file. + err := conn.loadVocabularyFile() + if err != nil { + logger.WithError(err).Error("error loading vocabulary file") + return arvados.Vocabulary{}, err + } + } + err := conn.maybeRefreshVocabularyCache(logger) + if err != nil { + logger.WithError(err).Error("error reloading vocabulary file - ignoring") + } + return *conn.vocabularyCache, nil +} + // Logout handles the logout of conn giving to the appropriate loginController func (conn *Conn) Logout(ctx context.Context, opts arvados.LogoutOptions) (arvados.LogoutResponse, error) { return conn.loginController.Logout(ctx, opts) @@ -95,3 +206,7 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.GroupConten return conn.railsProxy.GroupContents(ctx, options) } + +func httpErrorf(code int, format string, args ...interface{}) error { + return httpserver.ErrorWithStatus(fmt.Errorf(format, args...), code) +}