kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 01:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers: Create drivers/shared/structs

Browse Source 
This creates a drivers/shared/structs package and moves the buffer size
checks into it.
This commit is contained in:
Danielle Tomlinson
2018-11-28 17:29:57 +01:00
parent d2136e0aa7
commit 23197ec6b4
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/docker/handle.go
View File

@@ -13,8 +13,9 @@ import (
docker "github.com/fsouza/go-dockerclient"
hclog "github.com/hashicorp/go-hclog"
plugin "github.com/hashicorp/go-plugin"
"github.com/hashicorp/nomad/client/structs"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/drivers/docker/docklog"
dstructs "github.com/hashicorp/nomad/drivers/shared/structs"
"github.com/hashicorp/nomad/helper/stats"
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/plugins/shared"
@@ -31,11 +32,11 @@ type taskHandle struct {
containerID string
containerImage string
resourceUsageLock sync.RWMutex
resourceUsage *structs.TaskResourceUsage
resourceUsage *cstructs.TaskResourceUsage
doneCh chan bool
waitCh chan struct{}
removeContainerOnExit bool
net *structs.DriverNetwork
net *cstructs.DriverNetwork
exitResult *drivers.ExitResult
exitResultLock sync.Mutex
@@ -52,7 +53,7 @@ type taskHandleState struct {
ReattachConfig *shared.ReattachConfig
ContainerID string
DriverNetwork *structs.DriverNetwork
DriverNetwork *cstructs.DriverNetwork
}
func (h *taskHandle) buildState() *taskHandleState {
@@ -82,8 +83,8 @@ func (h *taskHandle) Exec(ctx context.Context, cmd string, args []string) (*driv
}
execResult := &drivers.ExecTaskResult{ExitResult: &drivers.ExitResult{}}
stdout, _ := circbuf.NewBuffer(int64(drivers.CheckBufSize))
stderr, _ := circbuf.NewBuffer(int64(drivers.CheckBufSize))
stdout, _ := circbuf.NewBuffer(int64(dstructs.CheckBufSize))
stderr, _ := circbuf.NewBuffer(int64(dstructs.CheckBufSize))
startOpts := docker.StartExecOptions{
Detach: false,
Tty: false,
@@ -155,7 +156,7 @@ func (h *taskHandle) Kill(killTimeout time.Duration, signal os.Signal) error {
return nil
}
func (h *taskHandle) Stats() (*structs.TaskResourceUsage, error) {
func (h *taskHandle) Stats() (*cstructs.TaskResourceUsage, error) {
h.resourceUsageLock.RLock()
defer h.resourceUsageLock.RUnlock()
var err error
@@ -235,7 +236,7 @@ func (h *taskHandle) collectStats() {
select {
case s := <-statsCh:
if s != nil {
ms := &structs.MemoryStats{
ms := &cstructs.MemoryStats{
RSS: s.MemoryStats.Stats.Rss,
Cache: s.MemoryStats.Stats.Cache,
Swap: s.MemoryStats.Stats.Swap,
@@ -243,7 +244,7 @@ func (h *taskHandle) collectStats() {
Measured: DockerMeasuredMemStats,
}
cs := &structs.CpuStats{
cs := &cstructs.CpuStats{
ThrottledPeriods: s.CPUStats.ThrottlingData.ThrottledPeriods,
ThrottledTime: s.CPUStats.ThrottlingData.ThrottledTime,
Measured: DockerMeasuredCpuStats,
@@ -262,8 +263,8 @@ func (h *taskHandle) collectStats() {
cs.TotalTicks = (cs.Percent / 100) * stats.TotalTicksAvailable() / float64(numCores)
h.resourceUsageLock.Lock()
h.resourceUsage = &structs.TaskResourceUsage{
ResourceUsage: &structs.ResourceUsage{
h.resourceUsage = &cstructs.TaskResourceUsage{
ResourceUsage: &cstructs.ResourceUsage{
MemoryStats: ms,
CpuStats: cs,
},

4
drivers/shared/executor/executor.go
View File

@@ -23,8 +23,8 @@ import (
shelpers "github.com/hashicorp/nomad/helper/stats"
"github.com/hashicorp/consul-template/signals"
dstructs "github.com/hashicorp/nomad/client/driver/structs"
cstructs "github.com/hashicorp/nomad/client/structs"
dstructs "github.com/hashicorp/nomad/drivers/shared/structs"
)
const (
@@ -310,7 +310,7 @@ func (e *UniversalExecutor) Exec(deadline time.Time, name string, args []string)
}
// ExecScript executes cmd with args and returns the output, exit code, and
// error. Output is truncated to client/driver/structs.CheckBufSize
// error. Output is truncated to drivers/shared/structs.CheckBufSize
func ExecScript(ctx context.Context, dir string, env []string, attrs *syscall.SysProcAttr,
name string, args []string) ([]byte, int, error) {
cmd := exec.CommandContext(ctx, name, args...)

2
drivers/shared/executor/executor_linux.go
View File

@@ -17,9 +17,9 @@ import (
"github.com/hashicorp/consul-template/signals"
hclog "github.com/hashicorp/go-hclog"
multierror "github.com/hashicorp/go-multierror"
dstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/client/stats"
cstructs "github.com/hashicorp/nomad/client/structs"
dstructs "github.com/hashicorp/nomad/drivers/shared/structs"
"github.com/hashicorp/nomad/helper/discover"
shelpers "github.com/hashicorp/nomad/helper/stats"
"github.com/hashicorp/nomad/helper/uuid"

4
drivers/shared/structs/structs.go Normal file
View File

@@ -0,0 +1,4 @@
package structs
// CheckBufSize is the size of the buffer that is used for job output
const CheckBufSize = 4 * 1024

5
plugins/drivers/driver.go
View File

@@ -18,11 +18,6 @@ import (
"github.com/zclconf/go-cty/cty/msgpack"
)
const (
// CheckBufSize is the size of the check output result
CheckBufSize = 4 * 1024
)
// DriverPlugin is the interface with drivers will implement. It is also
// implemented by a plugin client which proxies the calls to go-plugin. See
// the proto/driver.proto file for detailed information about each RPC and