- internal/executor: spark-submit 进程执行, exec.Command 切片形式
(绝不 shell) + stdout 10MiB tail-cap + app_id regex
+ 5 个单测覆盖 slice-form 注入防御 + 退出码
- internal/mcp/server.go: NewServer + Streamable HTTP Handler
- internal/mcp/tools/{list_clusters, spark_submit, deps, helpers}.go
- mcp-go API 实测修正: WithArray 用 Items() 声明 item 类型;
StreamableHTTPServer 直接实现 http.Handler, 无 .Handler() 方法
- main.go: 挂 /mcp 路由 (AgentAuth + mcpHandler 手动组合)
Co-Authored-By: Claude <noreply@anthropic.com>
136 lines
3.2 KiB
Go
136 lines
3.2 KiB
Go
// Command spark-mcp-go launches the Spark MCP Server.
|
|
//
|
|
// Phase 5 scope: config + slog + Gin + /healthz + /admin/* + /mcp
|
|
// Streamable HTTP. 2 MCP Tools wired (list_clusters, spark_submit).
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"log/slog"
|
|
"net/http"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
"spark-mcp-go/internal/admin"
|
|
"spark-mcp-go/internal/analyzer"
|
|
"spark-mcp-go/internal/audit"
|
|
"spark-mcp-go/internal/config"
|
|
"spark-mcp-go/internal/httpclient"
|
|
"spark-mcp-go/internal/logging"
|
|
mcpsrv "spark-mcp-go/internal/mcp"
|
|
"spark-mcp-go/internal/mcp/tools"
|
|
"spark-mcp-go/internal/middleware"
|
|
"spark-mcp-go/internal/storage"
|
|
)
|
|
|
|
func main() {
|
|
if err := run(); err != nil {
|
|
// run() handles its own logging; this is the last-chance report.
|
|
slog.Error("fatal", "err", err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
func run() error {
|
|
cfg, err := config.Load()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
logger, shutdownLog, err := logging.New(logging.Config{
|
|
Level: cfg.LogLevel,
|
|
Dir: cfg.LogDir,
|
|
Format: cfg.LogFormat,
|
|
LogToStd: true,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer shutdownLog()
|
|
slog.SetDefault(logger)
|
|
|
|
if err := os.MkdirAll(cfg.LogDir+"/tools", 0o700); err != nil {
|
|
return err
|
|
}
|
|
|
|
db, err := storage.Open(cfg.SQLitePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer db.Close()
|
|
logger.Info("storage.open", "path", cfg.SQLitePath)
|
|
|
|
gin.SetMode(gin.ReleaseMode)
|
|
r := gin.New()
|
|
r.Use(gin.Recovery())
|
|
|
|
r.GET("/healthz", func(c *gin.Context) {
|
|
c.JSON(http.StatusOK, gin.H{"ok": true, "version": "0.0.0"})
|
|
})
|
|
|
|
admin.Mount(r, db.Clusters(), audit.NewRepo(db), cfg.AdminTokens)
|
|
|
|
mcpHandler, err := mcpsrv.Handler(&tools.Deps{
|
|
Logger: logger.With("component", "mcp"),
|
|
ClusterRepo: db.Clusters(),
|
|
SparkSubmitTimeout: cfg.SparkSubmitTimeout,
|
|
HTTPClient: httpclient.New(httpclient.Config{
|
|
Timeout: cfg.HTTPClientTimeout,
|
|
MaxResponseBytes: cfg.MaxResponseBytes,
|
|
}),
|
|
MaxResponseBytes: cfg.MaxResponseBytes,
|
|
DataDir: cfg.DataDir,
|
|
AnalyzerThresholds: analyzer.Thresholds{
|
|
DataSkewRatio: cfg.AnalyzerDataSkewRatio,
|
|
GCPressureRatio: cfg.AnalyzerGCPressureRatio,
|
|
BottleneckShuffleGB: cfg.AnalyzerBottleneckShuffleGB,
|
|
},
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Wire AgentAuth for /mcp. We can't use gin.WrapH alone because
|
|
// AgentAuth is a gin middleware; compose it manually:
|
|
agentAuth := middleware.AgentAuth(cfg.AgentToken)
|
|
r.Any("/mcp", func(c *gin.Context) {
|
|
agentAuth(c)
|
|
if c.IsAborted() {
|
|
return
|
|
}
|
|
mcpHandler.ServeHTTP(c.Writer, c.Request)
|
|
})
|
|
|
|
srv := &http.Server{
|
|
Addr: cfg.ListenAddr,
|
|
Handler: r,
|
|
ReadHeaderTimeout: 10 * time.Second,
|
|
}
|
|
|
|
errCh := make(chan error, 1)
|
|
go func() {
|
|
logger.Info("server.start", "addr", cfg.ListenAddr, "data_dir", cfg.DataDir)
|
|
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
errCh <- err
|
|
}
|
|
}()
|
|
|
|
stop := make(chan os.Signal, 1)
|
|
signal.Notify(stop, os.Interrupt, syscall.SIGTERM)
|
|
|
|
select {
|
|
case err := <-errCh:
|
|
return err
|
|
case sig := <-stop:
|
|
logger.Info("server.shutdown", "signal", sig.String())
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
return srv.Shutdown(ctx)
|
|
}
|