mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-01-10 14:20:17 -06:00
* add tracing_enabled to the list of core targets * add endpoint, collector and service_name parameters * add authbasic config * configure tracing for missing services Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> Co-authored-by: Jörn Friedrich Dreyer <jfd@butonic.de>
207 lines
5.9 KiB
Go
207 lines
5.9 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"os/signal"
|
|
"path"
|
|
"time"
|
|
|
|
"github.com/cs3org/reva/cmd/revad/runtime"
|
|
"github.com/gofrs/uuid"
|
|
"github.com/micro/cli/v2"
|
|
"github.com/oklog/run"
|
|
"github.com/owncloud/ocis-reva/pkg/config"
|
|
"github.com/owncloud/ocis-reva/pkg/flagset"
|
|
"github.com/owncloud/ocis-reva/pkg/server/debug"
|
|
)
|
|
|
|
// StorageOCData is the entrypoint for the storage-oc-data command.
|
|
func StorageOCData(cfg *config.Config) *cli.Command {
|
|
return &cli.Command{
|
|
Name: "storage-oc-data",
|
|
Usage: "Start reva storage-oc-data service",
|
|
Flags: flagset.StorageOCDataWithConfig(cfg),
|
|
Before: func(c *cli.Context) error {
|
|
cfg.Reva.StorageOCData.Services = c.StringSlice("service")
|
|
|
|
return nil
|
|
},
|
|
Action: func(c *cli.Context) error {
|
|
logger := NewLogger(cfg)
|
|
|
|
if cfg.Tracing.Enabled {
|
|
switch t := cfg.Tracing.Type; t {
|
|
case "agent":
|
|
logger.Error().
|
|
Str("type", t).
|
|
Msg("Reva only supports the jaeger tracing backend")
|
|
|
|
case "jaeger":
|
|
logger.Info().
|
|
Str("type", t).
|
|
Msg("configuring reva to use the jaeger tracing backend")
|
|
|
|
case "zipkin":
|
|
logger.Error().
|
|
Str("type", t).
|
|
Msg("Reva only supports the jaeger tracing backend")
|
|
|
|
default:
|
|
logger.Warn().
|
|
Str("type", t).
|
|
Msg("Unknown tracing backend")
|
|
}
|
|
|
|
} else {
|
|
logger.Debug().
|
|
Msg("Tracing is not enabled")
|
|
}
|
|
|
|
var (
|
|
gr = run.Group{}
|
|
ctx, cancel = context.WithCancel(context.Background())
|
|
//metrics = metrics.New()
|
|
)
|
|
|
|
defer cancel()
|
|
|
|
{
|
|
uuid := uuid.Must(uuid.NewV4())
|
|
pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
|
|
|
|
rcfg := map[string]interface{}{
|
|
"core": map[string]interface{}{
|
|
"max_cpus": cfg.Reva.StorageOCData.MaxCPUs,
|
|
"tracing_enabled": cfg.Tracing.Enabled,
|
|
"tracing_endpoint": cfg.Tracing.Endpoint,
|
|
"tracing_collector": cfg.Tracing.Collector,
|
|
"tracing_service_name": "storage-oc-data",
|
|
},
|
|
"shared": map[string]interface{}{
|
|
"jwt_secret": cfg.Reva.JWTSecret,
|
|
},
|
|
"http": map[string]interface{}{
|
|
"network": cfg.Reva.StorageOCData.Network,
|
|
"address": cfg.Reva.StorageOCData.Addr,
|
|
// TODO build services dynamically
|
|
"services": map[string]interface{}{
|
|
"dataprovider": map[string]interface{}{
|
|
"prefix": cfg.Reva.StorageOCData.Prefix,
|
|
"driver": cfg.Reva.StorageOCData.Driver,
|
|
"drivers": map[string]interface{}{
|
|
"eos": map[string]interface{}{
|
|
"namespace": cfg.Reva.Storages.EOS.Namespace,
|
|
"shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace,
|
|
"share_folder": cfg.Reva.Storages.EOS.ShareFolder,
|
|
"eos_binary": cfg.Reva.Storages.EOS.EosBinary,
|
|
"xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary,
|
|
"master_url": cfg.Reva.Storages.EOS.MasterURL,
|
|
"slave_url": cfg.Reva.Storages.EOS.SlaveURL,
|
|
"cache_directory": cfg.Reva.Storages.EOS.CacheDirectory,
|
|
"enable_logging": cfg.Reva.Storages.EOS.EnableLogging,
|
|
"show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles,
|
|
"force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode,
|
|
"use_keytab": cfg.Reva.Storages.EOS.UseKeytab,
|
|
"sec_protocol": cfg.Reva.Storages.EOS.SecProtocol,
|
|
"keytab": cfg.Reva.Storages.EOS.Keytab,
|
|
"single_username": cfg.Reva.Storages.EOS.SingleUsername,
|
|
"enable_home": cfg.Reva.Storages.EOS.EnableHome,
|
|
"user_layout": cfg.Reva.Storages.EOS.Layout,
|
|
},
|
|
"local": map[string]interface{}{
|
|
"root": cfg.Reva.Storages.Local.Root,
|
|
},
|
|
"owncloud": map[string]interface{}{
|
|
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
|
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
|
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
|
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
|
|
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
|
},
|
|
"s3": map[string]interface{}{
|
|
"region": cfg.Reva.Storages.S3.Region,
|
|
"access_key": cfg.Reva.Storages.S3.AccessKey,
|
|
"secret_key": cfg.Reva.Storages.S3.SecretKey,
|
|
"endpoint": cfg.Reva.Storages.S3.Endpoint,
|
|
"bucket": cfg.Reva.Storages.S3.Bucket,
|
|
"prefix": cfg.Reva.Storages.S3.Prefix,
|
|
},
|
|
},
|
|
"temp_folder": cfg.Reva.StorageOCData.TempFolder,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
gr.Add(func() error {
|
|
runtime.Run(rcfg, pidFile)
|
|
return nil
|
|
}, func(_ error) {
|
|
logger.Info().
|
|
Str("server", c.Command.Name).
|
|
Msg("Shutting down server")
|
|
|
|
cancel()
|
|
})
|
|
}
|
|
|
|
{
|
|
server, err := debug.Server(
|
|
debug.Name(c.Command.Name+"-debug"),
|
|
debug.Addr(cfg.Reva.StorageOCData.DebugAddr),
|
|
debug.Logger(logger),
|
|
debug.Context(ctx),
|
|
debug.Config(cfg),
|
|
)
|
|
|
|
if err != nil {
|
|
logger.Info().
|
|
Err(err).
|
|
Str("server", c.Command.Name+"-debug").
|
|
Msg("Failed to initialize server")
|
|
|
|
return err
|
|
}
|
|
|
|
gr.Add(func() error {
|
|
return server.ListenAndServe()
|
|
}, func(_ error) {
|
|
ctx, timeout := context.WithTimeout(ctx, 5*time.Second)
|
|
|
|
defer timeout()
|
|
defer cancel()
|
|
|
|
if err := server.Shutdown(ctx); err != nil {
|
|
logger.Info().
|
|
Err(err).
|
|
Str("server", c.Command.Name+"-debug").
|
|
Msg("Failed to shutdown server")
|
|
} else {
|
|
logger.Info().
|
|
Str("server", c.Command.Name+"-debug").
|
|
Msg("Shutting down server")
|
|
}
|
|
})
|
|
}
|
|
|
|
{
|
|
stop := make(chan os.Signal, 1)
|
|
|
|
gr.Add(func() error {
|
|
signal.Notify(stop, os.Interrupt)
|
|
|
|
<-stop
|
|
|
|
return nil
|
|
}, func(err error) {
|
|
close(stop)
|
|
cancel()
|
|
})
|
|
}
|
|
|
|
return gr.Run()
|
|
},
|
|
}
|
|
}
|