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

Remove merrors package alias where possible

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-11-04 11:56:41 +01:00
parent ec582e736e
commit e04bfd0a3e
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mesos/pkg/scheduler/components/algorithm/algorithm.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/offers" "k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/queue"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@@ -72,12 +72,12 @@ func (k *schedulerAlgorithm) Schedule(pod *api.Pod) (string, error) {
podName, err := cache.MetaNamespaceKeyFunc(pod) podName, err := cache.MetaNamespaceKeyFunc(pod)
if err != nil { if err != nil {
log.Warningf("aborting Schedule, unable to understand pod object %+v", pod) log.Warningf("aborting Schedule, unable to understand pod object %+v", pod)
return "", merrors.NoSuchPodErr return "", errors.NoSuchPodErr
} }
if deleted := k.podUpdates.Poll(podName, queue.DELETE_EVENT); deleted { if deleted := k.podUpdates.Poll(podName, queue.DELETE_EVENT); deleted {
// avoid scheduling a pod that's been deleted between yieldPod() and Schedule() // avoid scheduling a pod that's been deleted between yieldPod() and Schedule()
log.Infof("aborting Schedule, pod has been deleted %+v", pod) log.Infof("aborting Schedule, pod has been deleted %+v", pod)
return "", merrors.NoSuchPodErr return "", errors.NoSuchPodErr
} }
podTask, err := podtask.New(ctx, "", pod) podTask, err := podtask.New(ctx, "", pod)
if err != nil { if err != nil {

4
contrib/mesos/pkg/scheduler/components/binder/binder.go
View File

@@ -22,7 +22,7 @@ import (
log "github.com/golang/glog" log "github.com/golang/glog"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@@ -63,7 +63,7 @@ func (b *binder) Bind(binding *api.Binding) error {
// in this case it's likely that the pod has been deleted between Schedule // in this case it's likely that the pod has been deleted between Schedule
// and Bind calls // and Bind calls
log.Infof("No pending task for pod %s", podKey) log.Infof("No pending task for pod %s", podKey)
return merrors.NoSuchPodErr //TODO(jdef) this error is somewhat misleading since the task could be running?! return errors.NoSuchPodErr //TODO(jdef) this error is somewhat misleading since the task could be running?!
} }
} }

6
contrib/mesos/pkg/scheduler/components/deleter/deleter.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/queue"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime" "k8s.io/kubernetes/contrib/mesos/pkg/runtime"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@@ -89,7 +89,7 @@ func (k *deleter) DeleteOne(pod *queuer.Pod) error {
switch task, state := k.sched.Tasks().ForPod(podKey); state { switch task, state := k.sched.Tasks().ForPod(podKey); state {
case podtask.StateUnknown: case podtask.StateUnknown:
log.V(2).Infof("Could not resolve pod '%s' to task id", podKey) log.V(2).Infof("Could not resolve pod '%s' to task id", podKey)
return merrors.NoSuchPodErr return errors.NoSuchPodErr
// determine if the task has already been launched to mesos, if not then // determine if the task has already been launched to mesos, if not then
// cleanup is easier (unregister) since there's no state to sync // cleanup is easier (unregister) since there's no state to sync
@@ -120,6 +120,6 @@ func (k *deleter) DeleteOne(pod *queuer.Pod) error {
default: default:
log.Infof("cannot kill pod '%s': non-terminal task not found %v", podKey, task.ID) log.Infof("cannot kill pod '%s': non-terminal task not found %v", podKey, task.ID)
return merrors.NoSuchTaskErr return errors.NoSuchTaskErr
} }
} }

4
contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/queue"
types "k8s.io/kubernetes/contrib/mesos/pkg/scheduler" types "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@@ -43,7 +43,7 @@ func TestDeleteOne_NonexistentPod(t *testing.T) {
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}}} }}}
err := d.DeleteOne(pod) err := d.DeleteOne(pod)
assert.Equal(err, merrors.NoSuchPodErr) assert.Equal(err, errors.NoSuchPodErr)
obj.AssertExpectations(t) obj.AssertExpectations(t)
} }

4
contrib/mesos/pkg/scheduler/components/errorhandler/errorhandler.go
View File

@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/backoff" "k8s.io/kubernetes/contrib/mesos/pkg/backoff"
"k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/queue"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podschedulers"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
@@ -53,7 +53,7 @@ func NewErrorHandler(sched scheduler.Scheduler, backoff *backoff.Backoff, qr *qu
// implementation of scheduling plugin's Error func; see plugin/pkg/scheduler // implementation of scheduling plugin's Error func; see plugin/pkg/scheduler
func (k *errorHandler) Error(pod *api.Pod, schedulingErr error) { func (k *errorHandler) Error(pod *api.Pod, schedulingErr error) {
if schedulingErr == merrors.NoSuchPodErr { if schedulingErr == errors.NoSuchPodErr {
log.V(2).Infof("Not rescheduling non-existent pod %v", pod.Name) log.V(2).Infof("Not rescheduling non-existent pod %v", pod.Name)
return return
} }

4
contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
View File

@@ -22,7 +22,7 @@ import (
log "github.com/golang/glog" log "github.com/golang/glog"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@@ -69,7 +69,7 @@ func (s *podReconciler) Reconcile(t *podtask.T) {
if err != nil { if err != nil {
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
// attempt to delete // attempt to delete
if err = s.deleter.DeleteOne(&queuer.Pod{Pod: &t.Pod}); err != nil && err != merrors.NoSuchPodErr && err != merrors.NoSuchTaskErr { if err = s.deleter.DeleteOne(&queuer.Pod{Pod: &t.Pod}); err != nil && err != errors.NoSuchPodErr && err != errors.NoSuchTaskErr {
log.Errorf("failed to delete pod: %v: %v", t.Pod.Name, err) log.Errorf("failed to delete pod: %v: %v", t.Pod.Name, err)
} }
} else { } else {

4
contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
View File

@@ -23,7 +23,7 @@ import (
mesos "github.com/mesos/mesos-go/mesosproto" mesos "github.com/mesos/mesos-go/mesosproto"
bindings "github.com/mesos/mesos-go/scheduler" bindings "github.com/mesos/mesos-go/scheduler"
"k8s.io/kubernetes/contrib/mesos/pkg/proc" "k8s.io/kubernetes/contrib/mesos/pkg/proc"
merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics"
) )
@@ -164,7 +164,7 @@ requestLoop:
metrics.ReconciliationExecuted.WithLabelValues("explicit").Inc() metrics.ReconciliationExecuted.WithLabelValues("explicit").Inc()
defer close(fin) defer close(fin)
err := <-r.Action(driver, cancel) err := <-r.Action(driver, cancel)
if err == merrors.ReconciliationCancelledErr { if err == errors.ReconciliationCancelledErr {
metrics.ReconciliationCancelled.WithLabelValues("explicit").Inc() metrics.ReconciliationCancelled.WithLabelValues("explicit").Inc()
log.Infoln(err.Error()) log.Infoln(err.Error())
} else if err != nil { } else if err != nil {