diff --git a/components/bench/ycsb.go b/components/bench/ycsb.go index 2db1e11e5c..82bf3da5f4 100644 --- a/components/bench/ycsb.go +++ b/components/bench/ycsb.go @@ -84,11 +84,11 @@ func (config ycsbConfig) toProperties() (*properties.Properties, error) { // these config are always included in the config file // should be overwritten if they are passed through the command line - if config.ReadProportion != 0 { + if config.ReadProportion != 0.95 { // we don't need to check errors since we disabled expansion _, _, _ = result.Set("readproportion", fmt.Sprint(config.ReadProportion)) } - if config.UpdateProportion != 0 { + if config.UpdateProportion != 0.05 { _, _, _ = result.Set("updateproportion", fmt.Sprint(config.UpdateProportion)) } if config.ScanProportion != 0 { diff --git a/embed/templates/systemd/system.service.tpl b/embed/templates/systemd/system.service.tpl index d4fd62c9ce..3d9966ab13 100644 --- a/embed/templates/systemd/system.service.tpl +++ b/embed/templates/systemd/system.service.tpl @@ -25,7 +25,7 @@ LimitSTACK=10485760 AmbientCapabilities=CAP_NET_RAW {{- end}} User={{.User}} -ExecStart={{.DeployDir}}/scripts/run_{{.ServiceName}}.sh +ExecStart=/bin/bash -c '{{.DeployDir}}/scripts/run_{{.ServiceName}}.sh' {{- if eq .ServiceName "prometheus"}} ExecReload=/bin/bash -c 'kill -HUP $MAINPID $(pidof {{.DeployDir}}/bin/ng-monitoring-server)' {{end}} diff --git a/embed/templates/systemd/tispark.service.tpl b/embed/templates/systemd/tispark.service.tpl index c3545c97bc..843dbdebdb 100644 --- a/embed/templates/systemd/tispark.service.tpl +++ b/embed/templates/systemd/tispark.service.tpl @@ -7,8 +7,8 @@ User={{.User}} {{- if ne .JavaHome ""}} Environment="JAVA_HOME={{.JavaHome}}" {{- end}} -ExecStart={{.DeployDir}}/sbin/start-{{.ServiceName}}.sh -ExecStop={{.DeployDir}}/sbin/stop-{{.ServiceName}}.sh +ExecStart=/bin/bash -c '{{.DeployDir}}/sbin/start-{{.ServiceName}}.sh' +ExecStop=/bin/bash -c '{{.DeployDir}}/sbin/stop-{{.ServiceName}}.sh' Type=forking {{- if .Restart}} Restart={{.Restart}} diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go index 549d854cc4..682238533b 100644 --- a/pkg/cluster/operation/check.go +++ b/pkg/cluster/operation/check.go @@ -189,8 +189,8 @@ func checkOSInfo(opt *CheckOptions, osInfo *sysinfo.OS) *CheckResult { // check version // CentOS 8 is known to be not working, and we don't have plan to support it // as of now, we may add support for RHEL 8 based systems in the future. - if ver, _ := strconv.ParseFloat(osInfo.Version, 64); ver < 7 || ver >= 8 { - result.Err = fmt.Errorf("%s %s not supported, use version 7 please", + if ver, _ := strconv.ParseFloat(osInfo.Version, 64); ver < 7 { + result.Err = fmt.Errorf("%s %s not supported, use version 8 please", osInfo.Name, osInfo.Release) return result }