Ported the patch from moby#33330 into this branch. The problem is the /var/run/docker.sock file can with the right conditions and bad timing be created as a directory rather than a link when the daemon is shutting down. Without this change docker would not restart after this timing issue hit until the /var/run/docker.sock directory was removed.
This is the second part, #327 addressed Docker-1.13.1
How I did it
vi is my friend.
How to verify it
The easiest way unfortunately calls for a code change. Please reference the test methodology in moby#33330. The file daemon/oci_linux.go needs to be modified and then docker needs to be compiled and installed after the modification.
Description for the changelog
Don't create /var/run/docker.sock as a directory when the daemon is shutting down
Signed-off-by: TomSweeneyRedHat tsweeney@redhat.com
Ported the patch from moby#33330 into this branch. The problem is the /var/run/docker.sock file can with the right conditions and bad timing be created as a directory rather than a link when the daemon is shutting down. Without this change docker would not restart after this timing issue hit until the /var/run/docker.sock directory was removed.
This is the second part, #327 addressed Docker-1.13.1
vi is my friend.
How to verify it The easiest way unfortunately calls for a code change. Please reference the test methodology in moby#33330. The file daemon/oci_linux.go needs to be modified and then docker needs to be compiled and installed after the modification.
Description for the changelog Don't create /var/run/docker.sock as a directory when the daemon is shutting down
** - Testing:
From journalctl with the new log entry showing that the error condition is being handled correctly: