Skip to content

Don't filter nodes if logdriver==none #2396

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

Merged
nishanttotla merged 1 commit into from
Oct 5, 2017
+28 −1
Merged

Don't filter nodes if logdriver==none #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion manager/scheduler/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (f *PluginFilter) Check(n *NodeInfo) bool {
}
}

if f.t.Spec.LogDriver != nil {
if f.t.Spec.LogDriver != nil && f.t.Spec.LogDriver.Name != "none" {
Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cpuguy83 do we need to check for "None" too or is this a case-sensitive keyword?

Copy link
Copy Markdown
Member Author

@cpuguy83 cpuguy83 Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check lower, but it is case sensitive in docker at least.

Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, in that case we can leave it as is for now.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also wondered if nil and "none" are the same, but I think they have a different meaning (nil being: use the default?) If not, and the are equal then ideally we should change "none" to nil in the spec

// If there are no log driver types in the list at all, most likely this is
// an older daemon that did not report this information. In this case don't filter
if typeFound, exists := f.pluginExistsOnNode("Log", f.t.Spec.LogDriver.Name, nodePlugins); !exists && typeFound {
Expand Down
27 changes: 27 additions & 0 deletions manager/scheduler/scheduler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,6 +2565,24 @@ func TestSchedulerPluginConstraint(t *testing.T) {
},
}

// no logging
t6 := &api.Task{
ID: "task6_ID",
DesiredState: api.TaskStateRunning,
Spec: api.TaskSpec{
Runtime: &api.TaskSpec_Container{
Container: &api.ContainerSpec{},
},
LogDriver: &api.Driver{Name: "none"},
},
ServiceAnnotations: api.Annotations{
Name: "task6",
},
Status: api.TaskStatus{
State: api.TaskStatePending,
},
}

s := store.NewMemoryStore(nil)
assert.NotNil(t, s)
defer s.Close()
Expand Down Expand Up @@ -2668,6 +2686,15 @@ func TestSchedulerPluginConstraint(t *testing.T) {
assignment4 := watchAssignment(t, watch)
assert.Equal(t, assignment4.ID, "task5_ID")
assert.Equal(t, assignment4.NodeID, "node4_ID")

err = s.Update(func(tx store.Tx) error {
assert.NoError(t, store.CreateTask(tx, t6))
return nil
})
assert.NoError(t, err)
assignment5 := watchAssignment(t, watch)
assert.Equal(t, assignment5.ID, "task6_ID")
assert.NotEqual(t, assignment5.NodeID, "")
}

func BenchmarkScheduler1kNodes1kTasks(b *testing.B) {
Expand Down