Skip to content

Cleaning up windows overlay network driver code and making it rely on HNS network information#1636

Merged
mavenugo merged 1 commit intomoby:masterfrom
msabansal:overlayfix
Feb 14, 2017
Merged

Cleaning up windows overlay network driver code and making it rely on HNS network information#1636
mavenugo merged 1 commit intomoby:masterfrom
msabansal:overlayfix

Conversation

@msabansal
Copy link
Contributor

This fixes issues when docker daemon goes out of sync and the network is not cleaned up either in the libnetwork overlay plugin's store or HNS store. We clean up the network in both the stores and then add them again.

Signed-off-by: msabansal sabansal@microsoft.com

@msabansal msabansal changed the title Minor bugfix for scenario where the network pre-exists in HNS Cleaning up windows overlay network driver code and making it rely on HNS network information Feb 8, 2017
Signed-off-by: msabansal <sabansal@microsoft.com>
Copy link

@dineshgovindasamy dineshgovindasamy left a comment

Choose a reason for hiding this comment

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

Looks good.

@mavenugo
Copy link
Contributor

@msabansal the bulk of the changes are removing the existing serf control-plane code which is obviously not used in swarm-mode. Since, Windows Overlay supports only the swarm-mode and is not supported for the external KV-Store mechanism, am fine with this change.
We are also actively trying to move the users away from the external kv-store approach to swarm-mode.

LGTM

@mavenugo mavenugo merged commit 5537cb4 into moby:master Feb 14, 2017
@aboch aboch mentioned this pull request Mar 1, 2017
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 6, 2023
The overlay driver was creating a global store whenever
netlabel.GlobalKVClient was specified in its config argument. This
specific label is not used anymore since 142b522 (moby#44875).

The local datastore is unused since 66895df (moby/libnetwork#1636).

Finally, the sync.Once properties are never used.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 31, 2023
The overlay driver was creating a global store whenever
netlabel.GlobalKVClient was specified in its config argument. This
specific label is not used anymore since 142b522 (moby#44875).

The local datastore is unused since 66895df (moby/libnetwork#1636).

Finally, the sync.Once properties are never used.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 31, 2023
The overlay driver was creating a global store whenever
netlabel.GlobalKVClient was specified in its config argument. This
specific label is unused anymore since 142b522 (moby#44875).

It was also creating a local store whenever netlabel.LocalKVClient was
specificed in its config argument. This store is unused since
moby/libnetwork@9e72136 (moby/libnetwork#1636).

Finally, the sync.Once properties are never used and thus can be
deleted.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton added a commit to akerouanton/docker that referenced this pull request Apr 6, 2023
The overlay driver was creating a global store whenever
netlabel.GlobalKVClient was specified in its config argument. This
specific label is unused anymore since 142b522 (moby#44875).

It was also creating a local store whenever netlabel.LocalKVClient was
specificed in its config argument. This store is unused since
moby/libnetwork@9e72136 (moby/libnetwork#1636).

Finally, the sync.Once properties are never used and thus can be
deleted.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants