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

Use host file/dir permissions when embedding

Browse Source
This commit is contained in:
Alex Dadgar
2015-09-24 17:47:38 -07:00
parent 0dd0bf39fa
commit 2ee8b22ddb
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/allocdir/alloc_dir.go
View File

@@ -121,7 +121,8 @@ func (d *AllocDir) Embed(task string, dirs map[string]string) error {
subdirs := make(map[string]string)
for source, dest := range dirs {
// Check to see if directory exists on host.
if _, err := os.Stat(source); os.IsNotExist(err) {
s, err := os.Stat(source)
if os.IsNotExist(err) {
continue
}
@@ -133,7 +134,7 @@ func (d *AllocDir) Embed(task string, dirs map[string]string) error {
// Create destination directory.
destDir := filepath.Join(taskdir, dest)
if err := os.MkdirAll(destDir, 0777); err != nil {
if err := os.MkdirAll(destDir, s.Mode().Perm()); err != nil {
return fmt.Errorf("Couldn't create destination directory %v: %v", destDir, err)
}
@@ -160,7 +161,7 @@ func (d *AllocDir) Embed(task string, dirs map[string]string) error {
continue
}
if err := d.linkOrCopy(hostEntry, taskEntry); err != nil {
if err := d.linkOrCopy(hostEntry, taskEntry, entry.Mode().Perm()); err != nil {
return err
}
}
@@ -192,14 +193,14 @@ func (d *AllocDir) MountSharedDir(task string) error {
return nil
}
func fileCopy(src, dst string) error {
func fileCopy(src, dst string, perm os.FileMode) error {
// Do a simple copy.
srcFile, err := os.Open(src)
if err != nil {
return fmt.Errorf("Couldn't open src file %v: %v", src, err)
}
dstFile, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE, 0777)
dstFile, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE, perm)
if err != nil {
return fmt.Errorf("Couldn't create destination file %v: %v", dst, err)
}

4
client/allocdir/alloc_dir_posix.go
View File

@@ -11,13 +11,13 @@ import (
"syscall"
)
func (d *AllocDir) linkOrCopy(src, dst string) error {
func (d *AllocDir) linkOrCopy(src, dst string, perm os.FileMode) error {
// Attempt to hardlink.
if err := os.Link(src, dst); err == nil {
return nil
}
return fileCopy(src, dst)
return fileCopy(src, dst, perm)
}
func (d *AllocDir) dropDirPermissions(path string) error {

7
client/allocdir/alloc_dir_windows.go
View File

@@ -1,8 +1,11 @@
package allocdir
import "errors"
import (
"errors"
"os"
)
func (d *AllocDir) linkOrCopy(src, dst string) error {
func (d *AllocDir) linkOrCopy(src, dst string, perm os.FileMode) error {
return fileCopy(src, dst)
}