From 5f8e0a60bf59296de40016e85c66fbe9fc60b276 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Mon, 26 Oct 2015 11:20:15 -0500
Subject: [PATCH] Rename SchedulerApi.{Algorithm -> PodScheduler}

---
 contrib/mesos/pkg/scheduler/api/types.go | 4 +---
 contrib/mesos/pkg/scheduler/plugin.go    | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/contrib/mesos/pkg/scheduler/api/types.go b/contrib/mesos/pkg/scheduler/api/types.go
index e6cba6b9518..a4cb11c645e 100644
--- a/contrib/mesos/pkg/scheduler/api/types.go
+++ b/contrib/mesos/pkg/scheduler/api/types.go
@@ -30,16 +30,14 @@ type SchedulerApi interface {
 	sync.Locker // synchronize scheduler plugin operations
 
 	podschedulers.SlaveIndex
-	Algorithm() podschedulers.PodScheduler
+	PodScheduler() podschedulers.PodScheduler
 	Offers() offers.Registry
 	Tasks() podtask.Registry
 
 	// driver calls
-
 	KillTask(taskId string) error
 	LaunchTask(*podtask.T) error
 
 	// convenience
-
 	CreatePodTask(api.Context, *api.Pod) (*podtask.T, error)
 }
diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go
index 99e20abda8d..ba3248e912c 100644
--- a/contrib/mesos/pkg/scheduler/plugin.go
+++ b/contrib/mesos/pkg/scheduler/plugin.go
@@ -65,7 +65,7 @@ type mesosSchedulerApiAdapter struct {
 	mesosScheduler *MesosScheduler
 }
 
-func (k *mesosSchedulerApiAdapter) Algorithm() podschedulers.PodScheduler {
+func (k *mesosSchedulerApiAdapter) PodScheduler() podschedulers.PodScheduler {
 	return k.mesosScheduler.podScheduler
 }
 
@@ -178,7 +178,7 @@ func (k *schedulerApiAlgorithmAdapter) doSchedule(task *podtask.T, err error) (s
 		}
 	}
 	if err == nil && offer == nil {
-		offer, err = k.api.Algorithm().SchedulePod(k.api.Offers(), k.api, task)
+		offer, err = k.api.PodScheduler().SchedulePod(k.api.Offers(), k.api, task)
 	}
 	if err != nil {
 		return "", err
@@ -199,7 +199,7 @@ func (k *schedulerApiAlgorithmAdapter) doSchedule(task *podtask.T, err error) (s
 		}
 
 		task.Offer = offer
-		k.api.Algorithm().Procurement()(task, details) // TODO(jdef) why is nothing checking the error returned here?
+		k.api.PodScheduler().Procurement()(task, details) // TODO(jdef) why is nothing checking the error returned here?
 
 		if err := k.api.Tasks().Update(task); err != nil {
 			offer.Release()
@@ -261,7 +261,7 @@ func (k *errorHandler) handleSchedulingError(pod *api.Pod, schedulingErr error)
 					// "backs off" when it can't find an offer that matches up with a pod.
 					// The backoff period for a pod can terminate sooner if an offer becomes
 					// available that matches up.
-					return !task.Has(podtask.Launched) && k.api.Algorithm().FitPredicate()(task, offer, nil)
+					return !task.Has(podtask.Launched) && k.api.PodScheduler().FitPredicate()(task, offer, nil)
 				default:
 					// no point in continuing to check for matching offers
 					return true