github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up error handling for the sandbox overlay

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-11-04 15:37:41 +01:00
parent 8af8aa4710
commit adfc63e749
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/minion/server.go
View File

@@ -219,7 +219,7 @@ func (ms *MinionServer) launchHyperkubeServer(server string, args []string, logF
} }
pwd, err := os.Getwd() pwd, err := os.Getwd()
if err != nil { if err != nil {
log.Fatalf("Cannot get current directory: %v", err) panic(fmt.Errorf("Cannot get current directory: %v", err))
} }
kmEnv = append(kmEnv, fmt.Sprintf("%s:%s", e, path.Join(pwd, "bin"))) kmEnv = append(kmEnv, fmt.Sprintf("%s:%s", e, path.Join(pwd, "bin")))
} }

2
contrib/mesos/pkg/scheduler/service/service.go
View File

@@ -366,7 +366,7 @@ func (s *SchedulerServer) prepareExecutorInfo(hks hyperkube.Interface) (*mesos.E
if s.sandboxOverlay != "" { if s.sandboxOverlay != "" {
if _, err := os.Stat(s.sandboxOverlay); os.IsNotExist(err) { if _, err := os.Stat(s.sandboxOverlay); os.IsNotExist(err) {
log.Fatalf("Sandbox overlay archive not found: %s", s.sandboxOverlay) return nil, nil, fmt.Errorf("Sandbox overlay archive not found: %s", s.sandboxOverlay)
} }
uri, _ := s.serveFrameworkArtifact(s.sandboxOverlay) uri, _ := s.serveFrameworkArtifact(s.sandboxOverlay)
ci.Uris = append(ci.Uris, &mesos.CommandInfo_URI{Value: proto.String(uri), Executable: proto.Bool(false), Extract: proto.Bool(true)}) ci.Uris = append(ci.Uris, &mesos.CommandInfo_URI{Value: proto.String(uri), Executable: proto.Bool(false), Extract: proto.Bool(true)})