github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix rebase error

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-11-04 13:58:21 +01:00
parent 72aa1bdd25
commit 8af8aa4710
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/mesos/pkg/scheduler/components/framework/framework.go
View File

@@ -21,7 +21,6 @@ import (
"io" "io"
"math" "math"
"net/http" "net/http"
"reflect"
"sync" "sync"
"time" "time"
@@ -669,7 +668,7 @@ func (k *framework) explicitlyReconcileTasks(driver bindings.SchedulerDriver, ta
// tell mesos to send us the latest status updates for all the non-terminal tasks that we know about // tell mesos to send us the latest status updates for all the non-terminal tasks that we know about
statusList := []*mesos.TaskStatus{} statusList := []*mesos.TaskStatus{}
remaining := sets.KeySet(reflect.ValueOf(taskToSlave)) remaining := sets.StringKeySet(taskToSlave)
for taskId, slaveId := range taskToSlave { for taskId, slaveId := range taskToSlave {
if slaveId == "" { if slaveId == "" {
delete(taskToSlave, taskId) delete(taskToSlave, taskId)

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

@@ -156,11 +156,11 @@ type SchedulerServer struct {
nodeRelistPeriod time.Duration nodeRelistPeriod time.Duration
sandboxOverlay string sandboxOverlay string
executable string // path to the binary running this service executable string // path to the binary running this service
client *client.Client client *client.Client
driver bindings.SchedulerDriver driver bindings.SchedulerDriver
driverMutex sync.RWMutex driverMutex sync.RWMutex
mux *http.ServeMux mux *http.ServeMux
} }
// useful for unit testing specific funcs // useful for unit testing specific funcs