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.

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

update fsnotify to v1.4.7 #37392

Merged
merged 1 commit into from
Jul 5, 2018
Merged

update fsnotify to v1.4.7 #37392

merged 1 commit into from
Jul 5, 2018

Conversation

thaJeztah
Copy link
Member

Fixes a possible deadlock on closing the watcher on kqueue

Full diff: fsnotify/fsnotify@4da3e2c...v1.4.7

Relevant change:

Fixes a possible deadlock on closing the watcher on kqueue

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

ping @cpuguy83 PTAL

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@thaJeztah
Copy link
Member Author

Janky https://jenkins.dockerproject.org/job/Docker-PRs/49957/console is failing on #34988 / #35039;

16:32:51 FAIL: check_test.go:347: DockerSwarmSuite.TearDownTest
16:32:51 
16:32:51 check_test.go:352:
16:32:51     d.Stop(c)
16:32:51 /go/src/github.com/docker/docker/internal/test/daemon/daemon.go:401:
16:32:51     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
16:32:51 ... Error: Error while stopping the daemon d80b0e79aeaf1 : exit status 130
16:32:51 
16:32:51 
16:32:51 ----------------------------------------------------------------------
16:32:51 PANIC: docker_api_swarm_test.go:359: DockerSwarmSuite.TestAPISwarmRaftQuorum
16:32:51 
16:32:51 [d80b0e79aeaf1] waiting for daemon to start
16:32:51 [d80b0e79aeaf1] daemon started
16:32:51 
16:32:51 [df17fe9c389ba] waiting for daemon to start
16:32:51 [df17fe9c389ba] daemon started
16:32:51 
16:32:51 [daa1fbf534ff8] waiting for daemon to start
16:32:51 [daa1fbf534ff8] daemon started
16:32:51 
16:32:51 [df17fe9c389ba] exiting daemon
16:32:51 [daa1fbf534ff8] exiting daemon
16:32:51 [df17fe9c389ba] waiting for daemon to start
16:32:51 [df17fe9c389ba] daemon started
16:32:51 
16:32:51 [d80b0e79aeaf1] daemon started
16:32:51 Attempt #2: daemon is still running with pid 32014
16:32:51 Attempt #3: daemon is still running with pid 32014
16:32:51 Attempt #4: daemon is still running with pid 32014
16:32:51 [d80b0e79aeaf1] exiting daemon
16:32:51 ... Panic: Fixture has panicked (see related PANIC)

PowerPC https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/10386/console as well;

16:34:18 FAIL: docker_api_swarm_test.go:359: DockerSwarmSuite.TestAPISwarmRaftQuorum
16:34:18 
16:34:18 [dfe5749ccf4c7] waiting for daemon to start
16:34:18 [dfe5749ccf4c7] daemon started
16:34:18 
16:34:18 [d8176498bf951] waiting for daemon to start
16:34:18 [d8176498bf951] daemon started
16:34:18 
16:34:18 [d6a1ac85d7cf1] waiting for daemon to start
16:34:18 [d6a1ac85d7cf1] daemon started
16:34:18 
16:34:18 [d8176498bf951] exiting daemon
16:34:18 [d6a1ac85d7cf1] exiting daemon
16:34:18 docker_api_swarm_test.go:385:
16:34:18     // d1 will eventually step down from leader because there is no longer an active quorum, wait for that to happen
16:34:18     waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
16:34:18         _, err = cli.ServiceCreate(context.Background(), service.Spec, types.ServiceCreateOptions{})
16:34:18         return err.Error(), nil
16:34:18     }, checker.Contains, "Make sure more than half of the managers are online.")
16:34:18 docker_utils_test.go:435:
16:34:18     c.Assert(v, checker, args...)
16:34:18 ... obtained string = "Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded"
16:34:18 ... substring string = "Make sure more than half of the managers are online."
16:34:18 
16:34:18 [dfe5749ccf4c7] exiting daemon

Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit e9c0435 into moby:master Jul 5, 2018
@thaJeztah thaJeztah deleted the bump_fsnotify branch July 5, 2018 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants