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

A number of cleanups

Browse Source 
- Removed some unused variables.
This commit is contained in:
Abhishek Chanda
2016-02-19 00:46:54 +00:00
parent 45b8670829
commit aa288c91d0
2 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/driver/rkt.go
View File

@@ -56,11 +56,9 @@ type RktDriverConfig struct {
// rktHandle is returned from Start/Open as a handle to the PID
type rktHandle struct {
pluginClient *plugin.Client
userPid int
executorPid int
executor executor.Executor
taskDir string
allocDir *allocdir.AllocDir
image string
logger *log.Logger
killTimeout time.Duration
waitCh chan *cstructs.WaitResult
@@ -71,10 +69,8 @@ type rktHandle struct {
// disk
type rktPID struct {
PluginConfig *PluginReattachConfig
TaskDir string
AllocDir *allocdir.AllocDir
UserPid int
Image string
ExecutorPid int
KillTimeout time.Duration
}
@@ -239,8 +235,7 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
h := &rktHandle{
pluginClient: pluginClient,
executor: exec,
image: img,
userPid: ps.Pid,
executorPid: ps.Pid,
logger: d.logger,
killTimeout: d.DriverContext.KillTimeout(task),
doneCh: make(chan struct{}),
@@ -264,8 +259,8 @@ func (d *RktDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, error
executor, pluginClient, err := createExecutor(pluginConfig, d.config.LogOutput, d.config)
if err != nil {
d.logger.Println("[ERROR] driver.rkt: error connecting to plugin so destroying plugin pid and user pid")
if e := destroyPlugin(qpid.PluginConfig.Pid, qpid.UserPid); e != nil {
d.logger.Printf("[ERROR] driver.rkt: error destroying plugin and userpid: %v", e)
if e := destroyPlugin(qpid.PluginConfig.Pid, qpid.ExecutorPid); e != nil {
d.logger.Printf("[ERROR] driver.rkt: error destroying plugin and executor pid: %v", e)
}
return nil, fmt.Errorf("error connecting to plugin: %v", err)
}
@@ -273,11 +268,9 @@ func (d *RktDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, error
// Return a driver handle
h := &rktHandle{
pluginClient: pluginClient,
userPid: qpid.UserPid,
taskDir: qpid.TaskDir,
executorPid: qpid.ExecutorPid,
allocDir: qpid.AllocDir,
executor: executor,
image: qpid.Image,
logger: d.logger,
killTimeout: qpid.KillTimeout,
doneCh: make(chan struct{}),
@@ -292,10 +285,8 @@ func (h *rktHandle) ID() string {
// Return a handle to the PID
pid := &rktPID{
PluginConfig: NewPluginReattachConfig(h.pluginClient.ReattachConfig()),
Image: h.image,
KillTimeout: h.killTimeout,
UserPid: h.userPid,
TaskDir: h.taskDir,
ExecutorPid: h.executorPid,
AllocDir: h.allocDir,
}
data, err := json.Marshal(pid)

32
client/driver/rkt_test.go
View File

@@ -66,10 +66,10 @@ func TestRktDriver_Start(t *testing.T) {
"image": "coreos.com/etcd:v2.0.4",
"command": "/etcd",
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
Resources: &structs.Resources{
MemoryMB: 128,
CPU: 100,
@@ -110,10 +110,10 @@ func TestRktDriver_Start_Wait(t *testing.T) {
"command": "/etcd",
"args": []string{"--version"},
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
Resources: &structs.Resources{
MemoryMB: 128,
CPU: 100,
@@ -158,10 +158,10 @@ func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
"command": "/etcd",
"args": []string{"--version"},
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
Resources: &structs.Resources{
MemoryMB: 128,
CPU: 100,
@@ -207,10 +207,10 @@ func TestRktDriver_Start_Wait_Logs(t *testing.T) {
"command": "/etcd",
"args": []string{"--version"},
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
LogConfig: &structs.LogConfig{
MaxFiles: 10,
MaxFileSizeMB: 10,
},
Resources: &structs.Resources{
MemoryMB: 128,
CPU: 100,