From adfc63e749b999076307af8c3be4c185516e221b Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 4 Nov 2015 15:37:41 +0100 Subject: [PATCH] Clean up error handling for the sandbox overlay --- contrib/mesos/pkg/minion/server.go | 2 +- contrib/mesos/pkg/scheduler/service/service.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/mesos/pkg/minion/server.go b/contrib/mesos/pkg/minion/server.go index e35c6602c7b..83003971aa9 100644 --- a/contrib/mesos/pkg/minion/server.go +++ b/contrib/mesos/pkg/minion/server.go @@ -219,7 +219,7 @@ func (ms *MinionServer) launchHyperkubeServer(server string, args []string, logF } pwd, err := os.Getwd() 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"))) } diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 5d4eea55fb5..c499e5595f9 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -366,7 +366,7 @@ func (s *SchedulerServer) prepareExecutorInfo(hks hyperkube.Interface) (*mesos.E if s.sandboxOverlay != "" { 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) ci.Uris = append(ci.Uris, &mesos.CommandInfo_URI{Value: proto.String(uri), Executable: proto.Bool(false), Extract: proto.Bool(true)})