create systemd dir when use systemd user mode

embed/templates/systemd/system.service.tpl

@@ -21,7 +21,7 @@ LimitCORE={{.LimitCORE}}
 LimitNOFILE=1000000
 LimitSTACK=10485760
 
-{{- if .GrantCapNetRaw}}
+{{- if and .GrantCapNetRaw (eq .SystemdMode "system")}}
 AmbientCapabilities=CAP_NET_RAW
 {{- end}}
 {{- if eq .SystemdMode "system"}}

pkg/cluster/manager/builder.go

@@ -140,7 +140,9 @@ func buildScaleOutTask(
 				dirs = append(dirs, spec.Abs(globalOptions.User, dirname))
 			}
 		}
-
+		if systemdMode == spec.UserMode {
+			dirs = append(dirs, spec.Abs(globalOptions.User, ".config/systemd/user"))
+		}
 		t := task.NewBuilder(m.logger).
 			RootSSH(
 				instance.GetManageHost(),
@@ -434,7 +436,7 @@ type hostInfo struct {
 func buildMonitoredDeployTask(
 	m *Manager,
 	uniqueHosts map[string]hostInfo, // host -> ssh-port, os, arch
-	noAgentHosts set.StringSet,      // hosts that do not deploy monitor agents
+	noAgentHosts set.StringSet, // hosts that do not deploy monitor agents
 	globalOptions *spec.GlobalOptions,
 	monitoredOptions *spec.MonitoredOptions,
 	gOpt operator.Options,
@@ -508,7 +510,7 @@ func buildMonitoredCertificateTasks(
 	m *Manager,
 	name string,
 	uniqueHosts map[string]hostInfo, // host -> ssh-port, os, arch
-	noAgentHosts set.StringSet,      // hosts that do not deploy monitor agents
+	noAgentHosts set.StringSet, // hosts that do not deploy monitor agents
 	globalOptions *spec.GlobalOptions,
 	monitoredOptions *spec.MonitoredOptions,
 	gOpt operator.Options,

pkg/cluster/manager/deploy.go

@@ -231,7 +231,9 @@ func (m *Manager) Deploy(
 		if strings.HasPrefix(globalOptions.DataDir, "/") {
 			dirs = append(dirs, globalOptions.DataDir)
 		}
-
+		if systemdMode == spec.UserMode {
+			dirs = append(dirs, spec.Abs(globalOptions.User, ".config/systemd/user"))
+		}
 		t := task.NewBuilder(m.logger).
 			RootSSH(
 				host,

pkg/cluster/operation/destroy.go

@@ -76,6 +76,15 @@ func Destroy(
 		}
 	}
 
+	// Delete systemd directory when use systemd user mode
+	if gOpts.SystemdMode == spec.UserMode {
+		for host := range instCount {
+			if err := DeleteSystemdDir(ctx, host, gOpts); err != nil {
+				return err
+			}
+		}
+	}
+
 	// after all things done, try to remove SSH public key
 	for host := range instCount {
 		if err := DeletePublicKey(ctx, host); err != nil {
@@ -150,6 +159,15 @@ func StopAndDestroyInstance(
 				logger.Warnf("failed to destroy %s: %v", "monitor", err)
 			}
 		}
+		// Delete systemd directory when use systemd user mode
+		if cluster.BaseTopo().GlobalOptions.SystemdMode == spec.UserMode {
+			if err := DeleteSystemdDir(ctx, instance.GetManageHost(), cluster.BaseTopo().GlobalOptions); err != nil {
+				if !ignoreErr {
+					return perrs.Annotatef(err, "failed to delete systemd directory")
+				}
+				logger.Warnf("failed to delete systemd directory: %v", err)
+			}
+		}
 
 		if err := DeletePublicKey(ctx, instance.GetManageHost()); err != nil {
 			if !ignoreErr {
@@ -202,6 +220,46 @@ func DeleteGlobalDirs(ctx context.Context, host string, options *spec.GlobalOpti
 	return nil
 }
 
+// DeleteSystemdDir deletes systemd directory of user mode when destroy node
+func DeleteSystemdDir(ctx context.Context, host string, options *spec.GlobalOptions) error {
+	if options == nil {
+		return nil
+	}
+
+	e := ctxt.GetInner(ctx).Get(host)
+	logger := ctx.Value(logprinter.ContextKeyLogger).(*logprinter.Logger)
+	logger.Infof("Clean systemd directory %s", host)
+	if options.SystemdMode != spec.UserMode {
+		return nil
+	}
+
+	dir := spec.Abs(options.User, ".config/systemd/user")
+
+	logger.Infof("\tClean directory %s on instance %s", dir, host)
+
+	c := module.ShellModuleConfig{
+		Command:  fmt.Sprintf("rmdir %s > /dev/null 2>&1 || true", dir),
+		Chdir:    "",
+		UseShell: false,
+	}
+	shell := module.NewShellModule(c)
+	stdout, stderr, err := shell.Execute(ctx, e)
+
+	if len(stdout) > 0 {
+		fmt.Println(string(stdout))
+	}
+	if len(stderr) > 0 {
+		logger.Errorf(string(stderr))
+	}
+
+	if err != nil {
+		return perrs.Annotatef(err, "failed to clean directory %s on: %s", dir, host)
+	}
+
+	logger.Infof("Clean systemd directory %s success", host)
+	return nil
+}
+
 // DeletePublicKey deletes the SSH public key from host
 func DeletePublicKey(ctx context.Context, host string) error {
 	e := ctxt.GetInner(ctx).Get(host)

pkg/cluster/spec/instance.go

@@ -215,9 +215,6 @@ func (i *BaseInstance) InitConfig(ctx context.Context, e ctxt.Executor, opt Glob
 	sudo := true
 	if opt.SystemdMode == UserMode {
 		systemdDir = "~/.config/systemd/user/"
-		if err := os.MkdirAll(systemdDir, os.ModePerm); err != nil {
-			return err
-		}
 		sudo = false
 	}
 	cmd := fmt.Sprintf("mv %s %s%s-%d.service", tgt, systemdDir, comp, port)