Avoid running plugin filter when Log Driver does not have a Name#2438
Avoid running plugin filter when Log Driver does not have a Name#2438dperny merged 1 commit intomoby:masterfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2438 +/- ##
=========================================
- Coverage 63.89% 60.5% -3.39%
=========================================
Files 64 128 +64
Lines 11788 26407 +14619
=========================================
+ Hits 7532 15978 +8446
- Misses 3649 9019 +5370
- Partials 607 1410 +803 |
13e1c97 to
407dc40
Compare
manager/scheduler/filter.go
Outdated
| } | ||
|
|
||
| if f.t.Spec.LogDriver != nil && f.t.Spec.LogDriver.Name != "none" { | ||
| if f.t.Spec.LogDriver != nil && (f.t.Spec.LogDriver.Name != "none" || f.t.Spec.LogDriver.Name != "") { |
There was a problem hiding this comment.
Please add a comment for this conditional
407dc40 to
61676ab
Compare
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
61676ab to
05c8675
Compare
|
@andrewhsu @thaJeztah is it too late to get this fix into 17.11? It should be a single line cherry pick. |
|
@nishanttotla would that be a bump of swarmkit to master, or do we have to cherry-pick into https://github.com/docker/swarmkit/tree/bump_v17.11? If the latter; please prepare a cherry-pick, so that we can act fast if it's still possible; I opened an internal tracking issue (you should see it linked above) |
|
@thaJeztah it would be a cherry-pick, not a bump. I'll open a cherry-pick right away regardless, even if we can't take it in. |
|
Just discussed and it's too late for 17.11, but can be considered backporting to supported releases (if other more critical issues warrant a patch release) |
|
IMO this should be a backport for 17.09 stable because basically it makes impossible to use Swarm with syslog logging, and it's a regression from 17.06 |
|
@vide I'll create the cherry-pick for that. |
When a LogDriver is provided without a name, as part of the service spec, the plugin filter fails to find a suitable node. This PR fixes that behavior, by ignoring the filtering for log drivers when the name isn't provided.
Fix #2392