From 47e2f1fba83148720311112a9bcd4b72429c1932 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Sun, 25 Oct 2015 15:34:12 -0700 Subject: [PATCH] Rename scheduler.{algorithm -> podschedulers} --- contrib/mesos/pkg/scheduler/api/mock.go | 6 +++--- contrib/mesos/pkg/scheduler/api/types.go | 6 +++--- contrib/mesos/pkg/scheduler/mesos_scheduler.go | 6 +++--- contrib/mesos/pkg/scheduler/plugin.go | 6 +++--- contrib/mesos/pkg/scheduler/plugin_test.go | 6 +++--- .../pkg/scheduler/{algorithm => podschedulers}/doc.go | 2 +- .../pkg/scheduler/{algorithm => podschedulers}/fcfs.go | 2 +- .../pkg/scheduler/{algorithm => podschedulers}/types.go | 2 +- contrib/mesos/pkg/scheduler/service/service.go | 8 ++++---- 9 files changed, 22 insertions(+), 22 deletions(-) rename contrib/mesos/pkg/scheduler/{algorithm => podschedulers}/doc.go (96%) rename contrib/mesos/pkg/scheduler/{algorithm => podschedulers}/fcfs.go (99%) rename contrib/mesos/pkg/scheduler/{algorithm => podschedulers}/types.go (98%) diff --git a/contrib/mesos/pkg/scheduler/api/mock.go b/contrib/mesos/pkg/scheduler/api/mock.go index 9fc62372023..41c4f5a2ddf 100644 --- a/contrib/mesos/pkg/scheduler/api/mock.go +++ b/contrib/mesos/pkg/scheduler/api/mock.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/mock" "k8s.io/kubernetes/contrib/mesos/pkg/offers" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" ) @@ -50,11 +50,11 @@ func (m *MockScheduler) SlaveHostNameFor(id string) (hostName string) { return } -func (m *MockScheduler) Algorithm() (f malgorithm.PodScheduler) { +func (m *MockScheduler) Algorithm() (f podschedulers.PodScheduler) { args := m.Called() x := args.Get(0) if x != nil { - f = x.(malgorithm.PodScheduler) + f = x.(podschedulers.PodScheduler) } return } diff --git a/contrib/mesos/pkg/scheduler/api/types.go b/contrib/mesos/pkg/scheduler/api/types.go index 05a92aac8fd..e6cba6b9518 100644 --- a/contrib/mesos/pkg/scheduler/api/types.go +++ b/contrib/mesos/pkg/scheduler/api/types.go @@ -20,7 +20,7 @@ import ( "sync" "k8s.io/kubernetes/contrib/mesos/pkg/offers" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" ) @@ -29,8 +29,8 @@ import ( type SchedulerApi interface { sync.Locker // synchronize scheduler plugin operations - malgorithm.SlaveIndex - Algorithm() malgorithm.PodScheduler + podschedulers.SlaveIndex + Algorithm() podschedulers.PodScheduler Offers() offers.Registry Tasks() podtask.Registry diff --git a/contrib/mesos/pkg/scheduler/mesos_scheduler.go b/contrib/mesos/pkg/scheduler/mesos_scheduler.go index ca4f762f08f..dee1aec848f 100644 --- a/contrib/mesos/pkg/scheduler/mesos_scheduler.go +++ b/contrib/mesos/pkg/scheduler/mesos_scheduler.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/proc" "k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" @@ -79,7 +79,7 @@ type MesosScheduler struct { // and the invoking the pod registry interfaces. // In particular, changes to podtask.T objects are currently guarded by this lock. *sync.RWMutex - malgorithm.PodScheduler + podschedulers.PodScheduler // Config related, write-once @@ -119,7 +119,7 @@ type MesosScheduler struct { type Config struct { SchedulerConfig schedcfg.Config Executor *mesos.ExecutorInfo - PodScheduler malgorithm.PodScheduler + PodScheduler podschedulers.PodScheduler Client *client.Client EtcdClient tools.EtcdClient FailoverTimeout float64 diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go index 59464d7c90d..2c42112b9e9 100644 --- a/contrib/mesos/pkg/scheduler/plugin.go +++ b/contrib/mesos/pkg/scheduler/plugin.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/offers" "k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" schedapi "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/api" merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/operations" @@ -56,7 +56,7 @@ type mesosSchedulerApiAdapter struct { mesosScheduler *MesosScheduler } -func (k *mesosSchedulerApiAdapter) Algorithm() malgorithm.PodScheduler { +func (k *mesosSchedulerApiAdapter) Algorithm() podschedulers.PodScheduler { return k.mesosScheduler } @@ -241,7 +241,7 @@ func (k *errorHandler) handleSchedulingError(pod *api.Pod, schedulingErr error) return } breakoutEarly := queue.BreakChan(nil) - if schedulingErr == malgorithm.NoSuitableOffersErr { + if schedulingErr == podschedulers.NoSuitableOffersErr { log.V(3).Infof("adding backoff breakout handler for pod %v", podKey) breakoutEarly = queue.BreakChan(k.api.Offers().Listen(podKey, func(offer *mesos.Offer) bool { k.api.Lock() diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go index 5d2db699cf7..058bfbc7c18 100644 --- a/contrib/mesos/pkg/scheduler/plugin_test.go +++ b/contrib/mesos/pkg/scheduler/plugin_test.go @@ -41,7 +41,7 @@ import ( "github.com/stretchr/testify/mock" assertext "k8s.io/kubernetes/contrib/mesos/pkg/assert" "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" @@ -449,7 +449,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest { ei.Data = []byte{0, 1, 2} // create scheduler - strategy := malgorithm.NewAllocationStrategy( + strategy := podschedulers.NewAllocationStrategy( podtask.NewDefaultPredicate( mresource.DefaultDefaultContainerCPULimit, mresource.DefaultDefaultContainerMemLimit, @@ -466,7 +466,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest { Host: apiServer.server.URL, Version: testapi.Default.Version(), }), - PodScheduler: malgorithm.NewFCFSPodScheduler(strategy, apiServer.LookupNode), + PodScheduler: podschedulers.NewFCFSPodScheduler(strategy, apiServer.LookupNode), SchedulerConfig: *schedcfg.CreateDefaultConfig(), LookupNode: apiServer.LookupNode, }) diff --git a/contrib/mesos/pkg/scheduler/algorithm/doc.go b/contrib/mesos/pkg/scheduler/podschedulers/doc.go similarity index 96% rename from contrib/mesos/pkg/scheduler/algorithm/doc.go rename to contrib/mesos/pkg/scheduler/podschedulers/doc.go index 29c11a93ac7..3e02add7f5c 100644 --- a/contrib/mesos/pkg/scheduler/algorithm/doc.go +++ b/contrib/mesos/pkg/scheduler/podschedulers/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package algorithm contains the PodSchedules which process offers and pod // create a scheduling match -package algorithm +package podschedulers diff --git a/contrib/mesos/pkg/scheduler/algorithm/fcfs.go b/contrib/mesos/pkg/scheduler/podschedulers/fcfs.go similarity index 99% rename from contrib/mesos/pkg/scheduler/algorithm/fcfs.go rename to contrib/mesos/pkg/scheduler/podschedulers/fcfs.go index 77c4891acbf..c2bf3766fa6 100644 --- a/contrib/mesos/pkg/scheduler/algorithm/fcfs.go +++ b/contrib/mesos/pkg/scheduler/podschedulers/fcfs.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package algorithm +package podschedulers import ( "fmt" diff --git a/contrib/mesos/pkg/scheduler/algorithm/types.go b/contrib/mesos/pkg/scheduler/podschedulers/types.go similarity index 98% rename from contrib/mesos/pkg/scheduler/algorithm/types.go rename to contrib/mesos/pkg/scheduler/podschedulers/types.go index 74fc20bfc92..94d63e19a03 100644 --- a/contrib/mesos/pkg/scheduler/algorithm/types.go +++ b/contrib/mesos/pkg/scheduler/podschedulers/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package algorithm +package podschedulers import ( "errors" diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index d53db093196..a8b46a0e47b 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -55,7 +55,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/profile" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler" - malgorithm "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" @@ -682,7 +682,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config log.Fatalf("misconfigured etcd: %v", err) } - as := malgorithm.NewAllocationStrategy( + as := podschedulers.NewAllocationStrategy( podtask.NewDefaultPredicate( s.DefaultContainerCPULimit, s.DefaultContainerMemLimit, @@ -695,7 +695,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config // downgrade allocation strategy if user disables "account-for-pod-resources" if !s.AccountForPodResources { - as = malgorithm.NewAllocationStrategy( + as = podschedulers.NewAllocationStrategy( podtask.DefaultMinimalPredicate, podtask.DefaultMinimalProcurement) } @@ -717,7 +717,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config return n.(*api.Node) } - fcfs := malgorithm.NewFCFSPodScheduler(as, lookupNode) + fcfs := podschedulers.NewFCFSPodScheduler(as, lookupNode) mesosPodScheduler := scheduler.New(scheduler.Config{ SchedulerConfig: *sc, Executor: executor,