Merge branch 'master' of github.com:hashicorp/nomad

client/alloc_runner_test.go

@@ -173,9 +173,9 @@ func TestAllocRunner_DiskExceeded_Destroy(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	})
 
-	// Create a 20mb file in the shared alloc directory, which should cause the
+	// Create a 20mb file in the alloc directory, which should cause the
 	// allocation to terminate in a failed state.
-	name := ar.ctx.AllocDir.SharedDir + "/20mb.bin"
+	name := ar.ctx.AllocDir.AllocDir + "/20mb.bin"
 	f, err := os.Create(name)
 	if err != nil {
 		t.Fatal("unable to create file: %v", err)

client/allocdir/alloc_dir.go

@@ -514,11 +514,11 @@ func (d *AllocDir) StopDiskWatcher() {
 	}
 }
 
-// syncDiskUsage walks the shared allocation directory recursively and
+// syncDiskUsage walks the allocation directory recursively and
 // calculates the total consumed disk space.
 func (d *AllocDir) syncDiskUsage() error {
 	var size int64
-	err := filepath.Walk(d.SharedDir,
+	err := filepath.Walk(d.AllocDir,
 		func(path string, info os.FileInfo, err error) error {
 			// Ignore paths that do not have a valid FileInfo object
 			if err == nil {