cluster: support tikv-worker

Author: Lloyd-Pottiger

pkg/cluster/spec/server_config.go

@@ -261,31 +261,19 @@ func checkConfig(ctx context.Context, e ctxt.Executor, componentName, componentS
 			version = utils.NightlyVersionAlias
 		}
 
-		// For some repos (e.g. internal ones), tikv-worker can be packaged as an
-		// extra binary inside the `tikv` component. Prefer checking with
-		// `bin/tikv-worker` when it exists, otherwise fall back to the component's
-		// default entry.
-		var binPath string
-		if componentName == ComponentTiKVWorker {
-			candidate := path.Join(paths.Deploy, "bin", ComponentTiKVWorker)
-			if _, _, err := e.Execute(ctx, "test -x "+candidate, false); err == nil {
-				binPath = candidate
-			}
-		} else {
-			entry, err := repo.ComponentBinEntry(componentSource, version)
-			if err != nil {
-				return perrs.Annotate(ErrorCheckConfig, err.Error())
-			}
-			binPath = path.Join(paths.Deploy, "bin", entry)
+		entry, err := repo.ComponentBinEntry(componentSource, version)
+		if err != nil {
+			return perrs.Annotate(ErrorCheckConfig, err.Error())
 		}
+		binPath := path.Join(paths.Deploy, "bin", entry)
 
 		// Skip old versions
 		if !hasConfigCheckFlag(ctx, e, binPath) {
 			return nil
 		}
 
 		extra := ""
-		if componentName == ComponentTiKV || componentName == ComponentTiKVWorker {
+		if componentName == ComponentTiKV {
 			// Pass in an empty pd address and the correct data dir
 			extra = fmt.Sprintf(`--pd "" --data-dir "%s"`, paths.Data[0])
 		}