transmit log rotation max size to nydus daemon

config/config.go

@@ -124,6 +124,7 @@ type DaemonConfig struct {
 	RecoverPolicy    string `toml:"recover_policy"`
 	FsDriver         string `toml:"fs_driver"`
 	ThreadsNumber    int    `toml:"threads_number"`
+	LogRotationSize  int    `toml:"log_rotation_size"`
 }
 
 type LoggingConfig struct {
@@ -227,6 +228,7 @@ func LoadSnapshotterConfig(path string) (*SnapshotterConfig, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "load toml configuration from file %q", path)
 	}
+
 	if err = tree.Unmarshal(&config); err != nil {
 		return nil, errors.Wrap(err, "unmarshal snapshotter configuration")
 	}

config/config_test.go

@@ -47,6 +47,7 @@ func TestLoadSnapshotterTOMLConfig(t *testing.T) {
 			RecoverPolicy:    "restart",
 			NydusdConfigPath: "/etc/nydus/nydusd-config.fusedev.json",
 			ThreadsNumber:    4,
+			LogRotationSize:  100,
 		},
 		SnapshotsConfig: SnapshotConfig{
 			EnableNydusOverlayFS: false,
@@ -77,7 +78,7 @@ func TestLoadSnapshotterTOMLConfig(t *testing.T) {
 			RotateLogLocalTime:  true,
 			RotateLogMaxAge:     7,
 			RotateLogMaxBackups: 5,
-			RotateLogMaxSize:    1,
+			RotateLogMaxSize:    100,
 			LogToStdout:         false,
 		},
 		MetricsConfig: MetricsConfig{

config/default.go

@@ -43,6 +43,7 @@ func (c *SnapshotterConfig) FillUpWithDefaults() error {
 	}
 	daemonConfig.RecoverPolicy = RecoverPolicyRestart.String()
 	daemonConfig.FsDriver = constant.DefaultFsDriver
+	daemonConfig.LogRotationSize = constant.DefaultDaemonRotateLogMaxSize
 
 	// cache configuration
 	cacheConfig := &c.CacheManagerConfig

config/global.go

@@ -83,6 +83,10 @@ func GetLogLevel() string {
 	return globalConfig.origin.LoggingConfig.LogLevel
 }
 
+func GetDaemonLogRotationSize() int {
+	return globalConfig.origin.DaemonConfig.LogRotationSize
+}
+
 func GetDaemonThreadsNumber() int {
 	return globalConfig.origin.DaemonConfig.ThreadsNumber
 }

internal/constant/values.go

@@ -44,9 +44,10 @@ const (
 	DefaultSystemControllerAddress = "/run/containerd-nydus/system.sock"
 
 	// Log rotation
-	DefaultRotateLogMaxSize    = 200 // 200 megabytes
-	DefaultRotateLogMaxBackups = 10
-	DefaultRotateLogMaxAge     = 0 // days
-	DefaultRotateLogLocalTime  = true
-	DefaultRotateLogCompress   = true
+	DefaultDaemonRotateLogMaxSize = 100 // 100 megabytes
+	DefaultRotateLogMaxSize       = 200 // 200 megabytes
+	DefaultRotateLogMaxBackups    = 5
+	DefaultRotateLogMaxAge        = 0 // days
+	DefaultRotateLogLocalTime     = true
+	DefaultRotateLogCompress      = true
 )

misc/snapshotter/config.toml

@@ -32,6 +32,9 @@ recover_policy = "restart"
 # Nydusd worker thread number to handle FUSE or fscache requests, [0-1024].
 # Setting to 0 will use the default configuration of nydusd.
 threads_number = 4
+# Log rotation size for nydusd, in unit MB(megabytes)
+log_rotation_size = 100
+
 
 [cgroup]
 # Whether to use separate cgroup for nydusd.
@@ -52,7 +55,7 @@ log_rotation_local_time = true
 log_rotation_max_age = 7
 log_rotation_max_backups = 5
 # In unit MB(megabytes)
-log_rotation_max_size = 1
+log_rotation_max_size = 100
 
 [metrics]
 # Enable by assigning an address, empty indicates metrics server is disabled

pkg/daemon/command/command.go

@@ -26,14 +26,15 @@ type DaemonCommand struct {
 	Upgrade        bool   `type:"flag" name:"upgrade" default:""`
 	ThreadNum      string `type:"param" name:"thread-num"`
 	// `--id` is required by `--supervisor` when starting nydusd
-	ID         string `type:"param" name:"id"`
-	Config     string `type:"param" name:"config"`
-	Bootstrap  string `type:"param" name:"bootstrap"`
-	Mountpoint string `type:"param" name:"mountpoint"`
-	APISock    string `type:"param" name:"apisock"`
-	LogLevel   string `type:"param" name:"log-level"`
-	Supervisor string `type:"param" name:"supervisor"`
-	LogFile    string `type:"param" name:"log-file"`
+	ID              string `type:"param" name:"id"`
+	Config          string `type:"param" name:"config"`
+	Bootstrap       string `type:"param" name:"bootstrap"`
+	Mountpoint      string `type:"param" name:"mountpoint"`
+	APISock         string `type:"param" name:"apisock"`
+	LogLevel        string `type:"param" name:"log-level"`
+	LogRotationSize int    `type:"param" name:"log-rotation-size"`
+	Supervisor      string `type:"param" name:"supervisor"`
+	LogFile         string `type:"param" name:"log-file"`
 }
 
 // Build exec style command line
@@ -62,7 +63,7 @@ func BuildCommand(opts []Opt) ([]string, error) {
 
 			value := v.Field(i).Interface()
 
-			pair := []string{fmt.Sprintf("--%s", tag.Get("name")), fmt.Sprintf("%s", value)}
+			pair := []string{fmt.Sprintf("--%s", tag.Get("name")), fmt.Sprintf("%v", value)}
 			args = append(args, pair...)
 		case "subcommand":
 			// Zero value will be skipped appending to command line
@@ -158,6 +159,12 @@ func WithLogLevel(l string) Opt {
 	}
 }
 
+func WithLogRotationSize(l int) Opt {
+	return func(cmd *DaemonCommand) {
+		cmd.LogRotationSize = l
+	}
+}
+
 func WithSupervisor(s string) Opt {
 	return func(cmd *DaemonCommand) {
 		cmd.Supervisor = s

pkg/daemon/config.go

@@ -65,6 +65,13 @@ func WithLogLevel(logLevel string) NewDaemonOpt {
 	}
 }
 
+func WithLogRotationSize(logRotationSize int) NewDaemonOpt {
+	return func(d *Daemon) error {
+		d.States.LogRotationSize = logRotationSize
+		return nil
+	}
+}
+
 func WithConfigDir(dir string) NewDaemonOpt {
 	return func(d *Daemon) error {
 		s := filepath.Join(dir, d.ID())

pkg/daemon/daemon.go

@@ -39,14 +39,15 @@ type NewDaemonOpt func(d *Daemon) error
 
 type States struct {
 	// A unique ID generated by daemon manager to identify the nydusd instance.
-	ID          string
-	ProcessID   int
-	APISocket   string
-	LogDir      string
-	LogLevel    string
-	LogToStdout bool
-	DaemonMode  config.DaemonMode
-	FsDriver    string
+	ID              string
+	ProcessID       int
+	APISocket       string
+	LogDir          string
+	LogLevel        string
+	LogRotationSize int
+	LogToStdout     bool
+	DaemonMode      config.DaemonMode
+	FsDriver        string
 	// Fusedev mountpoint on host kernel, the fscache fs driver doesn't need a host kernel mountpoint.
 	Mountpoint string
 	ThreadNum  int

pkg/filesystem/fs.go

@@ -582,6 +582,7 @@ func (fs *Filesystem) createDaemon(fsManager *manager.Manager, daemonMode config
 		daemon.WithConfigDir(config.GetConfigRoot()),
 		daemon.WithLogDir(config.GetLogDir()),
 		daemon.WithLogLevel(config.GetLogLevel()),
+		daemon.WithLogRotationSize(config.GetDaemonLogRotationSize()),
 		daemon.WithLogToStdout(config.GetLogToStdout()),
 		daemon.WithNydusdThreadNum(config.GetDaemonThreadsNumber()),
 		daemon.WithFsDriver(fsManager.FsDriver),

pkg/manager/daemon_adaptor.go

@@ -164,6 +164,10 @@ func (m *Manager) BuildDaemonCommand(d *daemon.Daemon, bin string, upgrade bool)
 		command.WithLogLevel(d.States.LogLevel),
 		command.WithAPISock(d.GetAPISock()))
 
+	if d.States.LogRotationSize > 0 {
+		cmdOpts = append(cmdOpts, command.WithLogRotationSize(d.States.LogRotationSize))
+	}
+
 	if upgrade {
 		cmdOpts = append(cmdOpts, command.WithUpgrade())
 	}