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.

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

Jump to bottom

Automated cherry pick of #9281 #9297

Merged
merged 2 commits into from
Feb 8, 2018
Merged

Automated cherry pick of #9281 #9297

merged 2 commits into from
Feb 8, 2018

Commits on Feb 7, 2018

  1. mvcc: restore unsynced watchers 

    In case syncWatchersLoop() starts before Restore() is called,
watchers already added by that moment are moved to s.synced by the loop.
However, there is a broken logic that moves watchers from s.synced
to s.uncyned without setting keyWatchers of the watcherGroup.
Eventually syncWatchers() fails to pickup those watchers from s.unsynced
and no events are sent to the watchers, because newWatcherBatch() called
in the function uses wg.watcherSetByKey() internally that requires
a proper keyWatchers value.
    @jpbetz
    Iwasaki Yudai authored and jpbetz committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    e08abbe View commit details
    Browse the repository at this point in the history

  2. mvcc: fix watchable store test for 3.2 cherrypick of etcd-io#9281

    @jpbetz
    jpbetz committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    33633da View commit details
    Browse the repository at this point in the history