From 5ede387a70e56eb6b89c18acf00abdbf16908d20 Mon Sep 17 00:00:00 2001
From: Sean Chittenden <sean@chittenden.org>
Date: Sun, 10 Jul 2016 00:12:59 -0700
Subject: [PATCH] Update comments and pushdown a lock into the resource
 container

---
 client/driver/executor/executor.go       | 17 +++++++++--------
 client/driver/executor/executor_linux.go |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
index 7d5b38882..14dce2fef 100644
--- a/client/driver/executor/executor.go
+++ b/client/driver/executor/executor.go
@@ -247,14 +247,15 @@ func (e *UniversalExecutor) LaunchCmd(command *ExecCommand, ctx *ExecutorContext
 	}
 
 	e.ctx.TaskEnv.Build()
-	// configuring the chroot, cgroup and enter the plugin process in the
-	// chroot
+	// configuring the chroot, resource container, and start the plugin
+	// process in the chroot.
 	if err := e.configureIsolation(); err != nil {
 		return nil, err
 	}
-	// Apply ourselves into the cgroup. The executor MUST be in the cgroup
-	// before the user task is started, otherwise we are subject to a fork
-	// attack in which a process escapes isolation by immediately forking.
+	// Apply ourselves into the resource container. The executor MUST be in
+	// the resource container before the user task is started, otherwise we
+	// are subject to a fork attack in which a process escapes isolation by
+	// immediately forking.
 	if err := e.applyLimits(os.Getpid()); err != nil {
 		return nil, err
 	}
@@ -428,8 +429,8 @@ func ClientCleanup(ic *dstructs.IsolationConfig, pid int) error {
 	return clientCleanup(ic, pid)
 }
 
-// Exit cleans up the alloc directory, destroys cgroups and kills the user
-// process
+// Exit cleans up the alloc directory, destroys resource container and kills the
+// user process
 func (e *UniversalExecutor) Exit() error {
 	var merr multierror.Error
 	if e.syslogServer != nil {
@@ -447,7 +448,7 @@ func (e *UniversalExecutor) Exit() error {
 		return nil
 	}
 
-	// Prefer killing the process via cgroups.
+	// Prefer killing the process via the resource container.
 	if e.cmd.Process != nil && !e.command.ResourceLimits {
 		proc, err := os.FindProcess(e.cmd.Process.Pid)
 		if err != nil {
diff --git a/client/driver/executor/executor_linux.go b/client/driver/executor/executor_linux.go
index 7771d7825..a748cabcc 100644
--- a/client/driver/executor/executor_linux.go
+++ b/client/driver/executor/executor_linux.go
@@ -255,8 +255,8 @@ func (e *UniversalExecutor) configureChroot() error {
 // should be called when tearing down the task.
 func (e *UniversalExecutor) removeChrootMounts() error {
 	// Prevent a race between Wait/ForceStop
-	e.cgLock.Lock()
-	defer e.cgLock.Unlock()
+	e.resCon.cgLock.Lock()
+	defer e.resCon.cgLock.Unlock()
 	return e.ctx.AllocDir.UnmountAll()
 }