Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only create the pbdInformer when gang scheduling is enabled #106

Merged
merged 2 commits into from
Apr 10, 2019
Merged

only create the pbdInformer when gang scheduling is enabled #106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a0192
only create the pbdInformer when gang scheduling is enabled
jq Apr 9, 2019
3b14971
reverse the logic
jq Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cmd/mpi-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
clientset "github.com/kubeflow/mpi-operator/pkg/client/clientset/versioned"
informers "github.com/kubeflow/mpi-operator/pkg/client/informers/externalversions"
"github.com/kubeflow/mpi-operator/pkg/controllers"
policyinformers "k8s.io/client-go/informers/policy/v1beta1"
)

var (
Expand Down Expand Up @@ -70,6 +71,10 @@ func main() {
kubeflowInformerFactory = informers.NewSharedInformerFactoryWithOptions(kubeflowClient, 0, informers.WithNamespace(namespace), nil)
}

var pdbInformer policyinformers.PodDisruptionBudgetInformer
if !enableGangScheduling {
jq marked this conversation as resolved.
Show resolved Hide resolved
pdbInformer = kubeInformerFactory.Policy().V1beta1().PodDisruptionBudgets()
}
controller := controllers.NewMPIJobController(
kubeClient,
kubeflowClient,
Expand All @@ -79,7 +84,7 @@ func main() {
kubeInformerFactory.Rbac().V1().RoleBindings(),
kubeInformerFactory.Apps().V1().StatefulSets(),
kubeInformerFactory.Batch().V1().Jobs(),
kubeInformerFactory.Policy().V1beta1().PodDisruptionBudgets(),
pdbInformer,
kubeflowInformerFactory.Kubeflow().V1alpha1().MPIJobs(),
gpusPerNode,
processingUnitsPerNode,
Expand Down
46 changes: 29 additions & 17 deletions pkg/controllers/mpi_job_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ func NewMPIJobController(
eventBroadcaster.StartLogging(glog.Infof)
eventBroadcaster.StartRecordingToSink(&typedcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{Component: controllerAgentName})
var pdbLister policylisters.PodDisruptionBudgetLister
var pdbSynced cache.InformerSynced

if !enableGangScheduling {
pdbLister = pdbInformer.Lister()
pdbSynced = pdbInformer.Informer().HasSynced
}

controller := &MPIJobController{
kubeClient: kubeClient,
Expand All @@ -189,8 +196,8 @@ func NewMPIJobController(
statefulSetSynced: statefulSetInformer.Informer().HasSynced,
jobLister: jobInformer.Lister(),
jobSynced: jobInformer.Informer().HasSynced,
pdbLister: pdbInformer.Lister(),
pdbSynced: pdbInformer.Informer().HasSynced,
pdbLister: pdbLister,
pdbSynced: pdbSynced,
mpiJobLister: mpiJobInformer.Lister(),
mpiJobSynced: mpiJobInformer.Informer().HasSynced,
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "MPIJobs"),
Expand Down Expand Up @@ -307,21 +314,26 @@ func NewMPIJobController(
},
DeleteFunc: controller.handleObject,
})
pdbInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: controller.handleObject,
UpdateFunc: func(old, new interface{}) {
newPolicy := new.(*policyv1beta1.PodDisruptionBudget)
oldPolicy := old.(*policyv1beta1.PodDisruptionBudget)
if newPolicy.ResourceVersion == oldPolicy.ResourceVersion {
// Periodic re-sync will send update events for all known PodDisruptionBudgets.
// Two different versions of the same Job will always have
// different RVs.
return
}
controller.handleObject(new)
},
DeleteFunc: controller.handleObject,
})

// there are cases pdbInformer is nil,
// i.e. We should only create the pbdInformer when gang scheduling is enabled.
if pdbInformer != nil {
pdbInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: controller.handleObject,
UpdateFunc: func(old, new interface{}) {
newPolicy := new.(*policyv1beta1.PodDisruptionBudget)
oldPolicy := old.(*policyv1beta1.PodDisruptionBudget)
if newPolicy.ResourceVersion == oldPolicy.ResourceVersion {
// Periodic re-sync will send update events for all known PodDisruptionBudgets.
// Two different versions of the same Job will always have
// different RVs.
return
}
controller.handleObject(new)
},
DeleteFunc: controller.handleObject,
})
}

return controller
}
Expand Down
45 changes: 37 additions & 8 deletions pkg/controllers/mpi_job_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
kubeinformers "k8s.io/client-go/informers"
policyinformers "k8s.io/client-go/informers/policy/v1beta1"
k8sfake "k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
Expand Down Expand Up @@ -142,13 +143,16 @@ func newMPIJobWithCustomResources(name string, replicas *int32, pusPerReplica in
return mpiJob
}

func (f *fixture) newController(processingResourceType string) (*MPIJobController, informers.SharedInformerFactory, kubeinformers.SharedInformerFactory) {
func (f *fixture) newController(processingResourceType string, enableGangScheduling bool) (*MPIJobController, informers.SharedInformerFactory, kubeinformers.SharedInformerFactory) {
f.client = fake.NewSimpleClientset(f.objects...)
f.kubeClient = k8sfake.NewSimpleClientset(f.kubeObjects...)

i := informers.NewSharedInformerFactory(f.client, noResyncPeriodFunc())
k8sI := kubeinformers.NewSharedInformerFactory(f.kubeClient, noResyncPeriodFunc())

var pdbInformer policyinformers.PodDisruptionBudgetInformer
if !enableGangScheduling {
pdbInformer = k8sI.Policy().V1beta1().PodDisruptionBudgets()
}
c := NewMPIJobController(
f.kubeClient,
f.client,
Expand All @@ -158,13 +162,13 @@ func (f *fixture) newController(processingResourceType string) (*MPIJobControlle
k8sI.Rbac().V1().RoleBindings(),
k8sI.Apps().V1().StatefulSets(),
k8sI.Batch().V1().Jobs(),
k8sI.Policy().V1beta1().PodDisruptionBudgets(),
pdbInformer,
i.Kubeflow().V1alpha1().MPIJobs(),
8,
8,
processingResourceType,
"kubectl-delivery",
false,
enableGangScheduling,
)

c.configMapSynced = alwaysReady
Expand Down Expand Up @@ -213,15 +217,20 @@ func (f *fixture) newController(processingResourceType string) (*MPIJobControlle
}

func (f *fixture) run(mpiJobName string, processingResourceType string) {
f.runController(mpiJobName, true, false, processingResourceType)
f.runController(mpiJobName, true, false, processingResourceType, false)
}

func (f *fixture) runWithGangScheduling(mpiJobName string, processingResourceType string) {
f.runController(mpiJobName, true, false, processingResourceType, true)
}

func (f *fixture) runExpectError(mpiJobName string, processingResourceType string) {
f.runController(mpiJobName, true, true, processingResourceType)
f.runController(mpiJobName, true, true, processingResourceType, false)
}

func (f *fixture) runController(mpiJobName string, startInformers bool, expectError bool, processingResourceType string) {
c, i, k8sI := f.newController(processingResourceType)
func (f *fixture) runController(
mpiJobName string, startInformers bool, expectError bool, processingResourceType string, enableGangScheduling bool) {
c, i, k8sI := f.newController(processingResourceType, enableGangScheduling)
if startInformers {
stopCh := make(chan struct{})
defer close(stopCh)
Expand Down Expand Up @@ -492,6 +501,26 @@ func TestLauncherNotControlledByUs(t *testing.T) {
f.runExpectError(getKey(mpiJob, t), gpuResourceName)
}

func TestLauncherSucceededWithGang(t *testing.T) {
f := newFixture(t)

startTime := metav1.Now()
completionTime := metav1.Now()
mpiJob := newMPIJob("test", int32Ptr(64), &startTime, &completionTime)
f.setUpMPIJob(mpiJob)

launcher := newLauncher(mpiJob, "kubectl-delivery")
launcher.Status.Succeeded = 1
f.setUpLauncher(launcher)

mpiJobCopy := mpiJob.DeepCopy()
mpiJobCopy.Status.LauncherStatus = kubeflow.LauncherSucceeded
setUpMPIJobTimestamp(mpiJobCopy, &startTime, &completionTime)
f.expectUpdateMPIJobStatusAction(mpiJobCopy)

f.runWithGangScheduling(getKey(mpiJob, t), gpuResourceName)
}

func TestLauncherSucceeded(t *testing.T) {
f := newFixture(t)

Expand Down