adjust the structure of directories (pingcap#52)

amyangfei · Dec 20, 2021 · 63cdbb5 · 63cdbb5
1 parent 4a237a6
commit 63cdbb5
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 12 deletions.
diff --git a/cmd/master-client/main.go b/cmd/master-client/main.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/hanfei1991/microcosm/client"
-	"github.com/hanfei1991/microcosm/master/jobmaster/benchmark"
+	"github.com/hanfei1991/microcosm/jobmaster/benchmark"
 	"github.com/hanfei1991/microcosm/pb"
 	"github.com/pkg/errors"
 )

diff --git a/executor/runtime/jobmaster/build.go b/executor/runtime/jobmaster/build.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/hanfei1991/microcosm/client"
 	"github.com/hanfei1991/microcosm/executor/runtime"
-	"github.com/hanfei1991/microcosm/master/jobmaster/benchmark"
-	"github.com/hanfei1991/microcosm/master/jobmaster/system"
+	"github.com/hanfei1991/microcosm/jobmaster/benchmark"
+	"github.com/hanfei1991/microcosm/jobmaster/system"
 	"github.com/hanfei1991/microcosm/model"
 	"github.com/hanfei1991/microcosm/pkg/errors"
 )

diff --git a/executor/runtime/jobmaster/operator.go b/executor/runtime/jobmaster/operator.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/hanfei1991/microcosm/executor/runtime"
-	"github.com/hanfei1991/microcosm/master/jobmaster/system"
+	"github.com/hanfei1991/microcosm/jobmaster/system"
 	"github.com/pingcap/tiflow/dm/pkg/log"
 	"go.uber.org/zap"
 )

diff --git a/master/jobmaster/benchmark/build.go → jobmaster/benchmark/build.go b/master/jobmaster/benchmark/build.go → jobmaster/benchmark/build.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/hanfei1991/microcosm/client"
-	"github.com/hanfei1991/microcosm/master/jobmaster/system"
+	"github.com/hanfei1991/microcosm/jobmaster/system"
 	"github.com/hanfei1991/microcosm/model"
 	"github.com/hanfei1991/microcosm/pkg/autoid"
 )

diff --git a/master/jobmaster/benchmark/config.go → jobmaster/benchmark/config.go b/master/jobmaster/benchmark/config.go → jobmaster/benchmark/config.go
diff --git a/master/jobmaster/benchmark/master.go → jobmaster/benchmark/jobmaster.go b/master/jobmaster/benchmark/master.go → jobmaster/benchmark/jobmaster.go
@@ -3,7 +3,7 @@ package benchmark
 import (
 	"context"
 
-	"github.com/hanfei1991/microcosm/master/jobmaster/system"
+	"github.com/hanfei1991/microcosm/jobmaster/system"
 	"github.com/hanfei1991/microcosm/model"
 )
 

diff --git a/master/jobmaster/system/impl.go → jobmaster/system/impl.go b/master/jobmaster/system/impl.go → jobmaster/system/impl.go
diff --git a/master/jobmaster/system/interface.go → jobmaster/system/interface.go b/master/jobmaster/system/interface.go → jobmaster/system/interface.go
diff --git a/master/cluster/executor_manager.go → master/executor_manager.go b/master/cluster/executor_manager.go → master/executor_manager.go
@@ -1,4 +1,4 @@
-package cluster
+package master
 
 import (
 	"context"

diff --git a/master/jobmanager.go b/master/jobmanager.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/hanfei1991/microcosm/client"
-	"github.com/hanfei1991/microcosm/master/jobmaster/system"
+	"github.com/hanfei1991/microcosm/jobmaster/system"
 	"github.com/hanfei1991/microcosm/model"
 	"github.com/hanfei1991/microcosm/pb"
 	"github.com/hanfei1991/microcosm/pkg/autoid"

diff --git a/master/server.go b/master/server.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/hanfei1991/microcosm/master/cluster"
 	"github.com/hanfei1991/microcosm/model"
 	"github.com/hanfei1991/microcosm/pb"
 	"github.com/hanfei1991/microcosm/pkg/errors"
@@ -29,7 +28,7 @@ type Server struct {
 	// election *election.Election
 
 	// sched scheduler
-	executorManager *cluster.ExecutorManager
+	executorManager *ExecutorManager
 	jobManager      *JobManager
 	//
 	cfg *Config
@@ -43,7 +42,7 @@ type Server struct {
 // NewServer creates a new master-server.
 func NewServer(cfg *Config, ctx *test.Context) (*Server, error) {
 	executorNotifier := make(chan model.ExecutorID, 100)
-	executorManager := cluster.NewExecutorManager(executorNotifier, cfg.KeepAliveTTL, cfg.KeepAliveInterval, ctx)
+	executorManager := NewExecutorManager(executorNotifier, cfg.KeepAliveTTL, cfg.KeepAliveInterval, ctx)
 
 	urls, err := parseURLs(cfg.MasterAddr)
 	if err != nil {

diff --git a/test/job_test.go b/test/job_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/hanfei1991/microcosm/client"
 	"github.com/hanfei1991/microcosm/executor"
 	"github.com/hanfei1991/microcosm/executor/runtime"
+	"github.com/hanfei1991/microcosm/jobmaster/benchmark"
 	"github.com/hanfei1991/microcosm/master"
-	"github.com/hanfei1991/microcosm/master/jobmaster/benchmark"
 	"github.com/hanfei1991/microcosm/pb"
 	"github.com/hanfei1991/microcosm/pkg/etcdutils"
 	. "github.com/pingcap/check"