LogDog: Use luci_config/server packages for config

logdog/server/service/service.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package service
 
 import (
-        "errors"
         "flag"
         "fmt"
         "net/http"
+        "net/url"
         "os"
         "os/signal"
         "path/filepath"
         "runtime/pprof"
         "sync/atomic"
         "time"
 
         "github.com/luci/luci-go/client/authcli"
         "github.com/luci/luci-go/common/auth"
+        "github.com/luci/luci-go/common/clock/clockflag"
+        "github.com/luci/luci-go/common/config/impl/filesystem"
         "github.com/luci/luci-go/common/data/caching/proccache"
+        "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/gcloud/gs"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
+        "github.com/luci/luci-go/common/proto/google"
         "github.com/luci/luci-go/common/tsmon"
         "github.com/luci/luci-go/common/tsmon/target"
         "github.com/luci/luci-go/grpc/prpc"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/api/endpoints/coordinator/services/v1"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/storage/bigtable"
         "github.com/luci/luci-go/logdog/server/retryServicesClient"
         "github.com/luci/luci-go/logdog/server/service/config"
         "github.com/luci/luci-go/luci_config/common/cfgtypes"
+        "github.com/luci/luci-go/luci_config/server/cfgclient"
+        "github.com/luci/luci-go/luci_config/server/cfgclient/backend/client"
+        "github.com/luci/luci-go/luci_config/server/cfgclient/backend/testconfig"
+        "github.com/luci/luci-go/luci_config/server/cfgclient/textproto"
 
         "cloud.google.com/go/compute/metadata"
         "golang.org/x/net/context"
         "golang.org/x/oauth2"
         "google.golang.org/api/option"
 )
 
 var (
         // ErrInvalidConfig is an error that is returned when the supplied
         // configuration is invalid.
         ErrInvalidConfig = errors.New("invalid configuration")
 
         // CoordinatorScopes is the set of OAuth2 scopes to use for the Coordinator
         // client.
         CoordinatorScopes = []string{
                 auth.OAuthScopeEmail,
         }
 )
 
 // projectConfigCacheDuration is the amount of time to cache a project's
 // configuration before reloading.
-const projectConfigCacheDuration = 30 * time.Minute
+const (
+        projectConfigCacheDuration = 30 * time.Minute
+
+        // minAuthTokenLifetime is the amount of time that an access token has before
+        // expiring.
+        minAuthTokenLifetime = 2 * time.Minute
+)
 
 // Service is a base class full of common LogDog service application parameters.
 type Service struct {
         // Name is the name of this service. It is used for logging, metrics, and
         // user agent string generation.
         //
         // If empty, a service name will be inferred from the command-line arguments.
         Name string
         // Flags is the set of flags that will be used by the Service.
         Flags flag.FlagSet
 
         shutdownFunc atomic.Value
 
         loggingFlags log.Config
         authFlags    authcli.Flags
-        configFlags  config.Flags
         tsMonFlags   tsmon.Flags
 
         coordinatorHost           string
         coordinatorInsecure       bool
-        serviceID                 string
         storageCredentialJSONPath string
         cpuProfilePath            string
         heapProfilePath           string
 
-        coord  logdog.ServicesClient
-        config *config.Manager
+        // onGCE is true if we're on GCE. We probe this exactly once.

[iannucci, 2017/01/21 00:23:14]

probe it... lazily? on init? from environ?

[dnj, 2017/01/21 01:37:31]

Once during "Run". updated.

+        onGCE bool
 
-        onGCE bool
+        killCheckInterval clockflag.Duration
+        configFilePath    string
+        serviceConfig     svcconfig.Config
+
+        // serviceID is the cloud project ID, which is also this service's unique
+        // ID. This can be specified by flag or, if on GCE, will automatically be
+        // probed from metadata.
+        serviceID string
+
+        coord logdog.ServicesClient
 }
 
 // Run performs service-wide initialization and invokes the specified run
 // function.
 func (s *Service) Run(c context.Context, f func(context.Context) error) {
         c = gologger.StdConfig.Use(c)
 
         // If a service name isn't specified, default to the base of the current
         // executable.
         if s.Name == "" {
@@ skipping 47 matching lines @@
 
                         if err := pprof.WriteHeapProfile(fd); err != nil {
                                 log.Fields{
                                         log.ErrorKey: err,
                                         "path":       p,
                                 }.Warningf(c, "Failed to write heap profile.")
                         }
                 }()
         }
 
-        // Are we running on a GCE intance?
-        if err := s.probeGCEEnvironment(c); err != nil {
-                log.WithError(err).Errorf(c, "Failed to probe GCE environment.")
-                return err
-        }
-
         // Validate the runtime environment.
         if s.serviceID == "" {
-                return errors.New("no service ID was configured")
+                return errors.New("no service ID was configured (-service-id)")
         }
 
+        // Install a process-wide cache.
+        c = proccache.Use(c, &proccache.Cache{})
+
         // Configure our signal handler. It will listen for terminating signals and
         // issue a shutdown signal if one is received.
         signalC := make(chan os.Signal)
         go func(c context.Context) {
                 hasShutdownAlready := false
                 for sig := range signalC {
                         if !hasShutdownAlready {
                                 hasShutdownAlready = true
 
                                 log.Warningf(log.SetField(c, "signal", sig), "Received close signal. Send again to terminate immediately.")
@@ skipping 15 matching lines @@
         // Initialize our tsmon library.
         c = tsmon.WithState(c, tsmon.NewState())
 
         if err := tsmon.InitializeFromFlags(c, &s.tsMonFlags); err != nil {
                 log.WithError(err).Warningf(c, "Failed to initialize monitoring; will continue without metrics.")
         }
         defer tsmon.Shutdown(c)
 
         // Initialize our Client instantiations.
         var err error
-        s.coord, err = s.initCoordinatorClient(c)
-        if err != nil {
+        if s.coord, err = s.initCoordinatorClient(c); err != nil {
                 log.WithError(err).Errorf(c, "Failed to setup Coordinator client.")
                 return err
         }
 
-        s.config, err = s.initConfig(c)
-        if err != nil {
+        // Initialize and install our config service and caching layers, and load our
+        // initial service config.
+        if err := s.initConfig(&c); err != nil {
                 log.WithError(err).Errorf(c, "Failed to setup configuration.")
                 return err
         }
-        defer s.config.Close()
 
+        // Clear our shutdown function on termination.
         defer s.SetShutdownFunc(nil)
 
-        // Install a process-wide cache.
-        c = proccache.Use(c, &proccache.Cache{})
-
         // Run main service function.
         return f(c)
 }
 
 func (s *Service) addFlags(c context.Context, fs *flag.FlagSet) {
         // Initialize logging flags.
         s.loggingFlags.Level = log.Warning
         s.loggingFlags.AddFlags(fs)
 
         // Initialize tsmon flags.
         s.tsMonFlags = tsmon.NewFlags()
         s.tsMonFlags.Flush = tsmon.FlushAuto
         s.tsMonFlags.Target.TargetType = target.TaskType
         s.tsMonFlags.Target.TaskJobName = s.Name
         s.tsMonFlags.Register(fs)
 
         s.authFlags.Register(fs, auth.Options{})
-        s.configFlags.AddToFlagSet(fs)
 
         fs.StringVar(&s.serviceID, "service-id", "",
                 "Specify the service ID that this instance is supporting. If empty, the service ID "+
                         "will attempt to be resolved by probing the local environment. This probably will match the "+
                         "App ID of the Coordinator.")
         fs.StringVar(&s.coordinatorHost, "coordinator", "",
                 "The Coordinator service's [host][:port].")
         fs.BoolVar(&s.coordinatorInsecure, "coordinator-insecure", false,
                 "Connect to Coordinator over HTTP (instead of HTTPS).")
         fs.StringVar(&s.storageCredentialJSONPath, "storage-credential-json-path", "",
                 "If supplied, the path of a JSON credential file to load and use for storage operations.")
         fs.StringVar(&s.cpuProfilePath, "cpu-profile-path", "",
                 "If supplied, enable CPU profiling and write the profile here.")
         fs.StringVar(&s.heapProfilePath, "heap-profile-path", "",
                 "If supplied, enable CPU profiling and write the profile here.")
+        fs.Var(&s.killCheckInterval, "config-kill-interval",
+                "If non-zero, poll for configuration changes and kill the application if one is detected.")

[iannucci, 2017/01/21 00:23:14]

ah, got it... that's why it was killfunc before. Could you clarify that as a
possible for the poller? e.g. "This is useful for stateless servers to kill
themselves when they need to take in new configuration data. It's safer+less
code than trying to ingest new configuration dynamically, and it ensures that
the service manager is actually working correctly :)"

[dnj, 2017/01/21 01:37:31]

Done.

+        fs.StringVar(&s.configFilePath, "config-file-path", "",
+                "If set, load configuration from a local filesystem rooted here.")

[iannucci, 2017/01/21 00:23:13]

for testing? or will this be used in production?

[dnj, 2017/01/21 01:37:31]

test

 }
 
 // probeGCEEnvironment fills in any parameters that can be probed from Google
 // Compute Engine metadata.
 //
 // If we're not running on GCE, this will return nil. An error will only be
 // returned if an operation that is expected to work fails.
 func (s *Service) probeGCEEnvironment(c context.Context) error {
         s.onGCE = metadata.OnGCE()
         if !s.onGCE {
@@ skipping 34 matching lines @@
         prpcClient.Options.UserAgent = fmt.Sprintf("%s/%s", s.Name, prpc.DefaultUserAgent)
         if s.coordinatorInsecure {
                 prpcClient.Options.Insecure = true
         }
         sc := logdog.NewServicesPRPCClient(&prpcClient)
 
         // Wrap the resulting client in a retry harness.
         return retryServicesClient.New(sc, nil), nil
 }
 
-func (s *Service) initConfig(c context.Context) (*config.Manager, error) {
-        rt, err := s.AuthenticatedTransport(c, nil)
-        if err != nil {
-                log.WithError(err).Errorf(c, "Failed to create config client.")
-                return nil, err
+func (s *Service) initConfig(c *context.Context) error {
+        opts := config.CacheOptions{
+                CacheExpiration: projectConfigCacheDuration,
         }
 
-        s.configFlags.RoundTripper = rt
-        o, err := s.configFlags.CoordinatorOptions(c, s.coord)
-        if err != nil {
-                log.WithError(err).Errorf(c, "Failed to load configuration parameters.")
-                return nil, err
+        // If a configFilePath was specified, use a mock configuration service that
+        // loads from a local file.
+        var p client.Provider
+        if s.configFilePath == "" {
+                ccfg, err := s.coord.GetConfig(*c, &google.Empty{})
+                if err != nil {
+                        return err
+                }
+
+                // Determine our config service host.
+                //
+                // Older Coordinator instances may provide the full URL instead of the host,
+                // in which case we will extract the host from the URL.
+                host := ccfg.ConfigServiceHost
+                if host == "" {
+                        if ccfg.ConfigServiceUrl == "" {
+                                return errors.New("coordinator does not specify a config service")
+                        }
+                        u, err := url.Parse(ccfg.ConfigServiceUrl)
+                        if err != nil {
+                                return errors.Annotate(err).Reason("failed to parse config service URL").Err()
+                        }
+                        host = u.Host
+                }
+
+                if ccfg.ConfigSet == "" {
+                        return errors.New("coordinator does not specify a config set")
+                }
+
+                log.Fields{
+                        "host": host,
+                }.Debugf(*c, "Using remote configuration service client.")
+                p = &client.RemoteProvider{
+                        Host: host,
+                }
+        } else {
+                // Test / Local: use filesystem config path.
+                ci, err := filesystem.New(s.configFilePath)
+                if err != nil {
+                        return err
+                }
+                p = &testconfig.Provider{Base: ci}
         }
-        o.ServiceID = s.serviceID
-        o.ProjectConfigCacheDuration = projectConfigCacheDuration
-        o.KillFunc = s.shutdown
 
-        return config.NewManager(c, *o)
+        // Add config caching layers.
+        *c = opts.WrapBackend(*c, &client.Backend{
+                Provider: p,
+        })
+
+        // Load our service configuration.
+        var meta cfgclient.Meta
+        cset, path := s.ServiceConfigPath()
+        if err := cfgclient.Get(*c, cfgclient.AsService, cset, path, textproto.Message(&s.serviceConfig), &meta); err != nil {
+                return errors.Annotate(err).Reason("failed to load service config").Err()
+        }
+
+        // Create a poller for our service config.
+        if s.killCheckInterval > 0 {
+                poller := config.ChangePoller{
+                        ConfigSet:     cset,
+                        Path:          path,
+                        CheckInterval: time.Duration(s.killCheckInterval),
+                        OnChange:      s.shutdown,

[iannucci, 2017/01/21 00:23:14]

os.Exit :p

*chants*
crash! crash! crash! crash! crash! crash! crash! crash! crash! crash! 

[dnj, 2017/01/21 01:37:31]

I want to flush :(

+                        ContentHash:   meta.ContentHash,
+                }
+                go poller.Run(*c)
+        }
+        return nil
+}
+
+// ServiceConfigPath returns the ConfigSet and path to the current service's
+// configuration.
+func (s *Service) ServiceConfigPath() (cfgtypes.ConfigSet, string) {
+        return cfgtypes.ServiceConfigSet(s.serviceID), svcconfig.ServiceConfigPath
+}
+
+// ServiceConfig returns the configuration data for the current service.
+func (s *Service) ServiceConfig() *svcconfig.Config { return &s.serviceConfig }
+
+// ProjectConfigPath returns the ConfigSet and path to the current service's
+// project configuration for proj.
+func (s *Service) ProjectConfigPath(proj cfgtypes.ProjectName) (cfgtypes.ConfigSet, string) {
+        return cfgtypes.ProjectConfigSet(proj), svcconfig.ProjectConfigPath(s.serviceID)
+}
+
+// ProjectConfig returns the current service's project configuration for proj.
+func (s *Service) ProjectConfig(c context.Context, proj cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
+        cset, path := s.ProjectConfigPath(proj)
+
+        var pcfg svcconfig.ProjectConfig
+        if err := cfgclient.Get(c, cfgclient.AsService, cset, path, textproto.Message(&pcfg), nil); err != nil {
+                return nil, errors.Annotate(err).Reason("failed to load project config from %(cset)s.%(path)s").
+                        D("cset", cset).D("path", path).Err()
+        }
+        return &pcfg, nil
 }
 
 // SetShutdownFunc sets the service shutdown function.
 func (s *Service) SetShutdownFunc(f func()) {
         s.shutdownFunc.Store(f)
 }
 
 func (s *Service) shutdown() {
         v := s.shutdownFunc.Load()
         if f, ok := v.(func()); ok {
                 f()
         } else {
                 s.shutdownImmediately()
         }
 }
 
 func (s *Service) shutdownImmediately() {
         os.Exit(1)
 }
 
-// Config returns the cached service configuration.
-func (s *Service) Config() *svcconfig.Config {
-        return s.config.Config()
-}
-
-// ProjectConfig returns the cached project configuration.
-//
-// If the project configuration is not available, nil will be returned.
-func (s *Service) ProjectConfig(c context.Context, proj cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
-        return s.config.ProjectConfig(c, proj)
-}
-
 // Coordinator returns the cached Coordinator client.
 func (s *Service) Coordinator() logdog.ServicesClient {
         return s.coord
 }
 
 // ServiceID returns the service ID.
 //
 // This is synonymous with the cloud "project ID" and the AppEngine "app ID".
 func (s *Service) ServiceID() string {
         return s.serviceID
 }
 
 // IntermediateStorage instantiates the configured intermediate Storage
 // instance.
 func (s *Service) IntermediateStorage(c context.Context) (storage.Storage, error) {
-        cfg := s.config.Config()
+        cfg := s.ServiceConfig()
         if cfg.GetStorage() == nil {
                 log.Errorf(c, "Missing storage configuration.")
                 return nil, ErrInvalidConfig
         }
 
         btcfg := cfg.GetStorage().GetBigtable()
         if btcfg == nil {
                 log.Errorf(c, "Missing BigTable storage configuration")
                 return nil, ErrInvalidConfig
         }
@@ skipping 89 matching lines @@
 //
 // An optional permutation function can be provided to modify those Options
 // before the Authenticator is created.
 func (s *Service) TokenSource(c context.Context, f func(o *auth.Options)) (oauth2.TokenSource, error) {
         a, err := s.Authenticator(c, f)
         if err != nil {
                 return nil, err
         }
         return a.TokenSource()
 }